Attachment #458386 for bug #604414




static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
                                     char __user *optval, int __user * optlen);

static int VSockVmciDgramSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
static int VSockVmciDgramRecvmsg(struct socket *sock,
static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
                                 struct msghdr *msg, size_t len, int flags);
static int VSockVmciStreamSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
static int VSockVmciStreamRecvmsg(struct socket *sock,
static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
                                 struct msghdr *msg, size_t len, int flags);

static int VSockVmciCreate(

                 vsockVmciProto.slab_obj_size, vsockVmciProto.slab);
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
   sk = sk_alloc(vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1);
#elif LINUX_VERSION_CODE > KERNEL_VERSION(4, 2, 0)
   sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 0);
#else
   sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto);
#endif

 */

static int
VSockVmciDgramSendmsg(struct socket *sock,          // IN: socket to send on
                      struct socket *sock,          // IN: socket to send on
                      struct msghdr *msg,           // IN: message to send
                      size_t len)                   // IN: length of message
{

 */

static int
VSockVmciStreamSendmsg(struct socket *sock,          // IN: socket to send on
                       struct socket *sock,          // IN: socket to send on
                       struct msghdr *msg,           // IN: message to send
                       size_t len)                   // IN: length of message
{

 */

static int
VSockVmciDgramRecvmsg(struct socket *sock,          // IN: socket to receive from
                      struct socket *sock,          // IN: socket to receive from
                      struct msghdr *msg,           // IN/OUT: message to receive into
                      size_t len,                   // IN: length of receive buffer
                      int flags)                    // IN: receive flags

 */

static int
VSockVmciStreamRecvmsg(struct socket *sock,          // IN: socket to receive from
                       struct socket *sock,          // IN: socket to receive from
                       struct msghdr *msg,           // IN/OUT: message to receive into
                       size_t len,                   // IN: length of receive buffer
                       int flags)                    // IN: receive flags

Return to bug 604414

Lines 232-244 Link Here

(-)work.orig/vsock-only/linux/af_vsock.c (-14 / +10 lines)
232	static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,	232	static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
233	char __user optval, int __user optlen);	233	char __user optval, int __user optlen);
234		234
235	static int VSockVmciDgramSendmsg(struct kiocb *kiocb,	235	static int VSockVmciDgramSendmsg(struct socket sock, struct msghdr msg, size_t len);
236	struct socket sock, struct msghdr msg, size_t len);	236	static int VSockVmciDgramRecvmsg(struct socket *sock,
237	static int VSockVmciDgramRecvmsg(struct kiocb kiocb, struct socket sock,
238	struct msghdr *msg, size_t len, int flags);	237	struct msghdr *msg, size_t len, int flags);
239	static int VSockVmciStreamSendmsg(struct kiocb *kiocb,	238	static int VSockVmciStreamSendmsg(struct socket sock, struct msghdr msg, size_t len);
240	struct socket sock, struct msghdr msg, size_t len);	239	static int VSockVmciStreamRecvmsg(struct socket *sock,
241	static int VSockVmciStreamRecvmsg(struct kiocb kiocb, struct socket sock,
242	struct msghdr *msg, size_t len, int flags);	240	struct msghdr *msg, size_t len, int flags);
243		241
244	static int VSockVmciCreate(	242	static int VSockVmciCreate(
Lines 2809-2814 Link Here
2809	vsockVmciProto.slab_obj_size, vsockVmciProto.slab);	2807	vsockVmciProto.slab_obj_size, vsockVmciProto.slab);
2810	#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)	2808	#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
2811	sk = sk_alloc(vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1);	2809	sk = sk_alloc(vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1);
		2810	#elif LINUX_VERSION_CODE > KERNEL_VERSION(4, 2, 0)
		2811	sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 0);
2812	#else	2812	#else
2813	sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto);	2813	sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto);
2814	#endif	2814	#endif
Lines 4193-4200 Link Here
4193	*/	4193	*/
4194		4194
4195	static int	4195	static int
4196	VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED	4196	VSockVmciDgramSendmsg(struct socket *sock, // IN: socket to send on
4197	struct socket *sock, // IN: socket to send on
4198	struct msghdr *msg, // IN: message to send	4197	struct msghdr *msg, // IN: message to send
4199	size_t len) // IN: length of message	4198	size_t len) // IN: length of message
4200	{	4199	{
Lines 4523-4530 Link Here
4523	*/	4522	*/
4524		4523
4525	static int	4524	static int
4526	VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED	4525	VSockVmciStreamSendmsg(struct socket *sock, // IN: socket to send on
4527	struct socket *sock, // IN: socket to send on
4528	struct msghdr *msg, // IN: message to send	4526	struct msghdr *msg, // IN: message to send
4529	size_t len) // IN: length of message	4527	size_t len) // IN: length of message
4530	{	4528	{
Lines 4692-4699 Link Here
4692	*/	4690	*/
4693		4691
4694	static int	4692	static int
4695	VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED	4693	VSockVmciDgramRecvmsg(struct socket *sock, // IN: socket to receive from
4696	struct socket *sock, // IN: socket to receive from
4697	struct msghdr *msg, // IN/OUT: message to receive into	4694	struct msghdr *msg, // IN/OUT: message to receive into
4698	size_t len, // IN: length of receive buffer	4695	size_t len, // IN: length of receive buffer
4699	int flags) // IN: receive flags	4696	int flags) // IN: receive flags
Lines 4783-4790 Link Here
4783	*/	4784	*/
4784		4785
4785	static int	4786	static int
4786	VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED	4787	VSockVmciStreamRecvmsg(struct socket *sock, // IN: socket to receive from
4787	struct socket *sock, // IN: socket to receive from
4788	struct msghdr *msg, // IN/OUT: message to receive into	4788	struct msghdr *msg, // IN/OUT: message to receive into
4789	size_t len, // IN: length of receive buffer	4789	size_t len, // IN: length of receive buffer
4790	int flags) // IN: receive flags	4790	int flags) // IN: receive flags