X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fsocket.c;h=a19ae1968d379d70ad36e51039d79469cfe30d18;hb=36d5fe6a000790f56039afe26834265db0a3ad4c;hp=fd8d86e06f95f5fbb5d146e5a8afd97ef3d65426;hpb=33807f4f0daec3b00565c2932d95f614f5833adf;p=~andy%2Flinux

diff --git a/net/socket.c b/net/socket.c
index fd8d86e06f9..a19ae1968d3 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1986,6 +1986,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;