diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-04-15 09:57:50 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-04-15 09:57:50 +0800 |
| commit | dc65fae3f730b6a1888f5559d68e59111f013c4f (patch) | |
| tree | 019e33c310553116b5b64042820bfb007b0fa832 /net/socket.c | |
| parent | 5ad6d9ba813e2a36b624970f7e5beb4e12641bee (diff) | |
| parent | f512eefd5cde0ad21bd99bbfe4dc70b62805838e (diff) | |
Merge tag 'v3.10.37' into linux-linaro-lsk
This is the 3.10.37 stable release
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index ac72efc3d965..fc90b4f0da3c 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1964,6 +1964,10 @@ static int copy_msghdr_from_user(struct msghdr *kmsg, { if (copy_from_user(kmsg, umsg, sizeof(struct msghdr))) return -EFAULT; + + if (kmsg->msg_namelen < 0) + return -EINVAL; + if (kmsg->msg_namelen > sizeof(struct sockaddr_storage)) kmsg->msg_namelen = sizeof(struct sockaddr_storage); return 0; |