Commit dbb490b9 authored by Matthew Leach's avatar Matthew Leach Committed by David S. Miller

net: socket: error on a negative msg_namelen

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: default avatarMatthew Leach <matthew.leach@arm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e814a6c
...@@ -1985,6 +1985,10 @@ static int copy_msghdr_from_user(struct msghdr *kmsg, ...@@ -1985,6 +1985,10 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,
{ {
if (copy_from_user(kmsg, umsg, sizeof(struct msghdr))) if (copy_from_user(kmsg, umsg, sizeof(struct msghdr)))
return -EFAULT; return -EFAULT;
if (kmsg->msg_namelen < 0)
return -EINVAL;
if (kmsg->msg_namelen > sizeof(struct sockaddr_storage)) if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
kmsg->msg_namelen = sizeof(struct sockaddr_storage); kmsg->msg_namelen = sizeof(struct sockaddr_storage);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment