diff options
| author | Matthew Leach <matthew.leach@arm.com> | 2014-03-11 11:58:27 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-14 06:42:16 -0700 |
| commit | 29a322f4572bcb20bc800e40b7f156f4ce0766fb (patch) | |
| tree | 6bef2ae6886bdad31cce5a60d0bb8ee5fc9d585d | |
| parent | cbbb5a252da5584e9a48e412e69ea09b4dd34cac (diff) | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 ac72efc3d96..fc90b4f0da3 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1964,6 +1964,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; |