diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-10 11:52:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-10 11:52:05 +0000 |
| commit | fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4 (patch) | |
| tree | c5b460cfc60b16a7c6718ae2613bb1d9cb98e5b8 /net/socket.c | |
| parent | 56d37d85438df38e150282baafe52dcd588854c7 (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
Merge tag 'v3.13-rc3' into asoc-arizona
Linux 3.13-rc3
Diffstat (limited to 'net/socket.c')
| -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; } |