Skip to content

Commit

Permalink
net: socket: error on a negative msg_namelen
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthew Leach authored and davem330 committed Mar 12, 2014
1 parent 7e814a6 commit dbb490b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions net/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -1985,6 +1985,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;
Expand Down

0 comments on commit dbb490b

Please sign in to comment.