diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:21 +0200 |
|---|---|---|
| committer | Joey Rizzoli <joey@lineageos.org> | 2017-05-02 15:35:15 +0200 |
| commit | c1fefda2315fef249e273b68684aa26492b06847 (patch) | |
| tree | 10a3d3eef3d291f39034e756c006423172211c1f | |
| parent | 0cd9e53e5e702f979775dc7af4b4a0027d6a287b (diff) | |
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.
Change-Id: I3598423e621275aa1d890b80bcf9018929087d90
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
| -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 d7b0d5e7025..b46db84546f 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3648,6 +3648,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; |