aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Konovalov <andreyknvl@google.com>2017-03-29 10:11:21 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-03 11:36:35 -0400
commit10452124bac39411e92fc8910dd418648bbb78ac (patch)
tree949d8012c2cda3c571d171f12a4a38c8765cdd76
parent3ae0fc950603dcc1716eba1f3a99d6119509c505 (diff)
net/packet: fix overflow in check for tp_frame_nr
[ 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>
-rw-r--r--net/packet/af_packet.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 8ab0974f4ee2..e064e3342825 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -4247,6 +4247,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
4247 rb->frames_per_block = req->tp_block_size / req->tp_frame_size; 4247 rb->frames_per_block = req->tp_block_size / req->tp_frame_size;
4248 if (unlikely(rb->frames_per_block == 0)) 4248 if (unlikely(rb->frames_per_block == 0))
4249 goto out; 4249 goto out;
4250 if (unlikely(req->tp_block_size > UINT_MAX / req->tp_block_nr))
4251 goto out;
4250 if (unlikely((rb->frames_per_block * req->tp_block_nr) != 4252 if (unlikely((rb->frames_per_block * req->tp_block_nr) !=
4251 req->tp_frame_nr)) 4253 req->tp_frame_nr))
4252 goto out; 4254 goto out;