diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 17:11:21 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-06-05 23:13:54 +0300 |
| commit | 1634172286550a62d8a0a98cf8bec5cd975fa09c (patch) | |
| tree | 67490c5efefbb6c984fa03b06b4d77928e32b3c1 | |
| parent | 091a6de006536c50f8a30db60d994a5b083b1c7b (diff) | |
| download | linux-1634172286550a62d8a0a98cf8bec5cd975fa09c.tar.xz | |
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 3a5a58f8baa2..92d57aac9e95 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; |