diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 02:12:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 02:12:04 +0100 |
| commit | 5c5bccb76cb94888f40ebd5584b81646632e9c3f (patch) | |
| tree | ee949fa6cc1dbe2632154b38ef6dd28f6185d218 /net/socket.c | |
| parent | ion: Reenable the build (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | linux-5c5bccb76cb94888f40ebd5584b81646632e9c3f.tar.xz linux-5c5bccb76cb94888f40ebd5584b81646632e9c3f.zip | |
Merge 3.13-rc4 into staging-next.
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 0b18693f2be6..e83c416708af 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1973,7 +1973,7 @@ static int copy_msghdr_from_user(struct msghdr *kmsg, if (copy_from_user(kmsg, umsg, sizeof(struct msghdr))) return -EFAULT; if (kmsg->msg_namelen > sizeof(struct sockaddr_storage)) - return -EINVAL; + kmsg->msg_namelen = sizeof(struct sockaddr_storage); return 0; } |