diff options
author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:21 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2017-06-05 21:17:21 +0100 |
commit | a318bc0bcec7f7867f1f1d8cef5ae6f25aa169a7 (patch) | |
tree | c04b4cf0dbd39d75867644830c798ceb53faab26 | |
parent | a481ab4edd87bc2dc6f1fa9029866dd69c86fc5c (diff) |
net/packet: fix overflow in check for tp_frame_nr
commit 8f8d28e4d6d815a391285e121c3a53a0b6cb9e7b upstream.
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: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index a56a8d059bd1..689dc9592f63 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3854,6 +3854,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, 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; |