| From | Ben Hutchings <> | Date | Mon, 28 Apr 2014 02:11:21 +0100 | Subject | [PATCH 3.2 05/94] net: socket: error on a negative msg_namelen |
| |
3.2.58-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Leach <matthew.leach@arm.com>
[ 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: Ben Hutchings <ben@decadent.org.uk> --- net/socket.c | 4 ++++ 1 file changed, 4 insertions(+)
--- a/net/socket.c +++ b/net/socket.c @@ -1884,6 +1884,10 @@ static int copy_msghdr_from_user(struct { 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;
|