diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:21 +0200 |
|---|---|---|
| committer | Stuart Scott <stuartscott@google.com> | 2017-05-19 20:37:26 +0000 |
| commit | 69f5a950235b614cac7aee62f83abe004684f7c4 (patch) | |
| tree | 0c60b618d991a79b7a2703ec9ce62f20d9de6421 | |
| parent | e993ad751e8d562c6e220ac34c89e6c669c7ed9b (diff) | |
| download | x86_64-69f5a950235b614cac7aee62f83abe004684f7c4.tar.gz | |
UPSTREAM: net/packet: fix overflow in check for tp_frame_nr
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.
Bug: 36725304
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 8f8d28e4d6d815a391285e121c3a53a0b6cb9e7b)
Change-Id: I86e923ec03855dd7c8faaddc861a6211d03f0bc2
| -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 f176ee2d86b9..bc748caffdd5 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3649,6 +3649,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; |