Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f447e3fe authored by Al Viro's avatar Al Viro Committed by Amit Pundir
Browse files

UPSTREAM: net: validate the range we feed to iov_iter_init() in sys_sendto/sys_recvfrom 



(cherry pick from commit 4de930efc23b92ddf88ce91c405ee645fe6e27ea)

Cc: stable@vger.kernel.org # v3.19
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Bug: 28759139
Change-Id: I556eab62bc545f4382f93d0c721df342bbe76787
parent 1aace0c9

net/socket.c

+4 −0
Original line number Diff line number Diff line
@@ -1790,6 +1790,8 @@ SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len, 


	if (len > INT_MAX)

		len = INT_MAX;

	if (unlikely(!access_ok(VERIFY_READ, buff, len)))

		return -EFAULT;

	sock = sockfd_lookup_light(fd, &err, &fput_needed);

	if (!sock)

		goto out;
@@ -1849,6 +1851,8 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, 


	if (size > INT_MAX)

		size = INT_MAX;

	if (unlikely(!access_ok(VERIFY_WRITE, ubuf, size)))

		return -EFAULT;

	sock = sockfd_lookup_light(fd, &err, &fput_needed);

	if (!sock)

		goto out;