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

[<gregkh@linuxfoundation.org>]

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

    net/packet: fix overflow in check for tp_frame_nr

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_frame_nr.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:21 +0200
Subject: net/packet: fix overflow in check for tp_frame_nr

From: Andrey Konovalov <andreyknvl@google.com>


[ Upstream commit 8f8d28e4d6d815a391285e121c3a53a0b6cb9e7b ]

When calculating rb->frames_per_block * req->tp_block_nr the result
can overflow.

Add a check that tp_block_size * tp_block_nr <= UINT_MAX.

Since frames_per_block <= tp_block_size, the expression would
never overflow.

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
@@ -4247,6 +4247,8 @@ static int packet_set_ring(struct sock *
 		rb->frames_per_block = req->tp_block_size / req->tp_frame_size;
 		if (unlikely(rb->frames_per_block == 0))
 			goto out;
+		if (unlikely(req->tp_block_size > UINT_MAX / req->tp_block_nr))
+			goto out;
 		if (unlikely((rb->frames_per_block * req->tp_block_nr) !=
 					req->tp_frame_nr))
 			goto out;


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