diff options
| author | Matthew Leach <matthew.leach@arm.com> | 2014-03-11 11:58:27 +0000 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2014-05-20 16:35:10 +0200 |
| commit | a5401293b1e9722702f84a15392989b89abca4fd (patch) | |
| tree | 04ee2351fddabfffc9c62d3a17645e78914c7bd5 | |
| parent | e1dd1f75fb1015277ccf21437a15ef809546c37f (diff) | |
| download | linux-2.6.32.y-drm33.z-a5401293b1e9722702f84a15392989b89abca4fd.tar.gz | |
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: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
| -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 54ac14baa70b4..19671d8e20f68 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1871,6 +1871,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; |