aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Leach <matthew.leach@arm.com>2014-03-11 11:58:27 +0000
committerWilly Tarreau <w@1wt.eu>2014-05-19 07:54:16 +0200
commita452ae0af4da31194e70c76b070bc60a31b985c6 (patch)
tree9a6ca267624acf77e34c9c02209da8b5cf62a35e
parent3c3e5e546a2a8fe6b2d5d5e5e3385430999ce585 (diff)
downloadlinux-linaro-stable-a452ae0af4da31194e70c76b070bc60a31b985c6.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>
-rw-r--r--net/socket.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c
index 54ac14baa70b..19671d8e20f6 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;