diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2017-07-21 18:49:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-24 14:17:01 -0700 |
| commit | 864d9664245565a6b9df86a68c7664a25a4fcd58 (patch) | |
| tree | bd4f88253d94a17bbe7e811fc2243ba56890cfaf /net | |
| parent | 490198ea62b3beb56322e8b00d5d925d6afeb76d (diff) | |
| download | linux-stable-864d9664245565a6b9df86a68c7664a25a4fcd58.tar.gz linux-stable-864d9664245565a6b9df86a68c7664a25a4fcd58.tar.bz2 linux-stable-864d9664245565a6b9df86a68c7664a25a4fcd58.zip | |
net/socket: fix type in assignment and trim long line
The commit ffb07550c76f ("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: ffb07550c76f ("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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index bf2122691fba..ad22df1ffbd1 100644 --- a/net/socket.c +++ b/net/socket.c @@ -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; |