diff options
| author | Matthew Leach <matthew.leach@arm.com> | 2014-03-11 11:58:27 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-30 16:23:16 +0100 |
| commit | d46880faad42eea3c68a525fec579bcf104d2f55 (patch) | |
| tree | cc6f3f20046fabfe75699ee9afd461614b71c14f /net | |
| parent | c99f58d722f7566041f88cea72c78785e717ce72 (diff) | |
| download | linux-stable-d46880faad42eea3c68a525fec579bcf104d2f55.tar.gz linux-stable-d46880faad42eea3c68a525fec579bcf104d2f55.tar.bz2 linux-stable-d46880faad42eea3c68a525fec579bcf104d2f55.zip | |
net: socket: error on a negative msg_namelen
[ Upstream commit dbb490b96584d4e958533fb637f08b557f505657 ]
When copying in a struct msghdr from the user, if the user has set the
msg_namelen parameter to a negative value it gets clamped to a valid
size due to a comparison between signed and unsigned values.
Ensure the syscall errors when the user passes in a negative value.
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -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 d4faaded1a9d..3faa358d377f 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1884,6 +1884,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; |