diff options
| author | Kal Conley <kal.conley@dectris.com> | 2019-02-10 09:57:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-27 10:08:58 +0100 |
| commit | c2ee2c708aaea514f6efeb9ecdfc491a4da30b3f (patch) | |
| tree | c9995861cba229a9ebc4e48e9f69f8537442d41b /net/packet | |
| parent | f3ec82db191b74fc9c9f45ddd76870e10bb3d405 (diff) | |
| download | linux-stable-c2ee2c708aaea514f6efeb9ecdfc491a4da30b3f.tar.gz linux-stable-c2ee2c708aaea514f6efeb9ecdfc491a4da30b3f.tar.bz2 linux-stable-c2ee2c708aaea514f6efeb9ecdfc491a4da30b3f.zip | |
net/packet: fix 4gb buffer limit due to overflow check
[ Upstream commit fc62814d690cf62189854464f4bd07457d5e9e50 ]
When calculating rb->frames_per_block * req->tp_block_nr the result
can overflow. Check it for overflow without limiting the total buffer
size to UINT_MAX.
This change fixes support for packet ring buffers >= UINT_MAX.
Fixes: 8f8d28e4d6d8 ("net/packet: fix overflow in check for tp_frame_nr")
Signed-off-by: Kal Conley <kal.conley@dectris.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index c76c21604ffd..fd16fb836df2 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -4275,7 +4275,7 @@ 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)) + if (unlikely(rb->frames_per_block > UINT_MAX / req->tp_block_nr)) goto out; if (unlikely((rb->frames_per_block * req->tp_block_nr) != req->tp_frame_nr)) |