diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-14 20:41:53 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-14 20:41:53 +0000 |
commit | 64a9aa9cf57dd551a9ae9bf48f5e63be608aae72 (patch) | |
tree | d5776aa6b85c7a0c4fa3565bd3881f9607c293dc /net/compat.c | |
parent | 16d7ea9167839d0b971ab29030886280595dd5fc (diff) | |
parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) |
Merge tag 'v3.13-rc3' into asoc-pcm
Linux 3.13-rc3
Diffstat (limited to 'net/compat.c')
-rw-r--r-- | net/compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/compat.c b/net/compat.c index 618c6a8a911b..dd32e34c1e2c 100644 --- a/net/compat.c +++ b/net/compat.c @@ -72,7 +72,7 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg) __get_user(kmsg->msg_flags, &umsg->msg_flags)) return -EFAULT; if (kmsg->msg_namelen > sizeof(struct sockaddr_storage)) - return -EINVAL; + kmsg->msg_namelen = sizeof(struct sockaddr_storage); kmsg->msg_name = compat_ptr(tmp1); kmsg->msg_iov = compat_ptr(tmp2); kmsg->msg_control = compat_ptr(tmp3); |