Commit 864d9664 authored Jul 21, 2017 by Paolo Abeni Committed by David S. Miller Jul 24, 2017

net/socket: fix type in assignment and trim long line



The commit ffb07550 ("copy_msghdr_from_user(): get rid of
field-by-field copyin") introduce a new sparse warning:

net/socket.c:1919:27: warning: incorrect type in assignment (different address spaces)
net/socket.c:1919:27:    expected void *msg_control
net/socket.c:1919:27:    got void [noderef] <asn:1>*[addressable] msg_control

and a line above 80 chars, let's fix them

Fixes: ffb07550 ("copy_msghdr_from_user(): get rid of field-by-field copyin")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 490198ea

net/socket.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1916,7 +1916,7 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,
		if (copy_from_user(&msg, umsg, sizeof(*umsg)))
		return -EFAULT;

		kmsg->msg_control = msg.msg_control;
		kmsg->msg_control = (void __force *)msg.msg_control;
		kmsg->msg_controllen = msg.msg_controllen;
		kmsg->msg_flags = msg.msg_flags;

		@@ -1935,7 +1935,8 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,

		if (msg.msg_name && kmsg->msg_namelen) {
		if (!save_addr) {
		err = move_addr_to_kernel(msg.msg_name, kmsg->msg_namelen,
		err = move_addr_to_kernel(msg.msg_name,
		kmsg->msg_namelen,
		kmsg->msg_name);
		if (err < 0)
		return err;

Admin message