Patch "net/packet: fix overflow in check for tp_reserve" has been added to the 4.9-stable tree

Patch "net/packet: fix overflow in check for tp_reserve" has been added to the 4.9-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    net/packet: fix overflow in check for tp_reserve

to the 4.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-packet-fix-overflow-in-check-for-tp_reserve.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Sat Apr 29 08:22:13 CEST 2017
From: Andrey Konovalov <andreyknvl@google.com>
Date: Wed, 29 Mar 2017 16:11:22 +0200
Subject: net/packet: fix overflow in check for tp_reserve

From: Andrey Konovalov <andreyknvl@google.com>


[ Upstream commit bcc5364bdcfe131e6379363f089e7b4108d35b70 ]

When calculating po->tp_hdrlen + po->tp_reserve the result can overflow.

Fix by checking that tp_reserve <= INT_MAX on assign.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/packet/af_packet.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3702,6 +3702,8 @@ packet_setsockopt(struct socket *sock, i
 			return -EBUSY;
 		if (copy_from_user(&val, optval, sizeof(val)))
 			return -EFAULT;
+		if (val > INT_MAX)
+			return -EINVAL;
 		po->tp_reserve = val;
 		return 0;
 	}


Patches currently in stable-queue which might be from andreyknvl@google.com are

queue-4.9/ipv6-check-skb-protocol-before-lookup-for-nexthop.patch
queue-4.9/ping-implement-proper-locking.patch
queue-4.9/net-timestamp-avoid-use-after-free-in-ip_recv_error.patch
queue-4.9/sctp-listen-on-the-sock-only-when-it-s-state-is-listening-or-closed.patch
queue-4.9/net-ipv6-regenerate-host-route-if-moved-to-gc-list.patch
queue-4.9/net-ipv6-rtf_pcpu-should-not-be-settable-from-userspace.patch
queue-4.9/net-packet-fix-overflow-in-check-for-tp_frame_nr.patch
queue-4.9/net-packet-fix-overflow-in-check-for-tp_reserve.patch
queue-4.9/tcp-memset-ca_priv-data-to-0-properly.patch
queue-4.9/ip6mr-fix-notification-device-destruction.patch