From 5879a28eccaaa48f8687b4f30c6ee75825e1f6f4 Mon Sep 17 00:00:00 2001 From: Kal Conley Date: Wed, 20 Feb 2019 15:44:39 +0000 Subject: [PATCH] net/packet: fix 4gb buffer limit due to overflow check mainline inclusion from mainline-v5.0 commit fc62814d690c category: bugfix bugzilla: 9556 CVE: NA ------------------------------------------------- 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 Signed-off-by: David S. Miller Signed-off-by: Shangli Reviewed-by: Mao Wenan Signed-off-by: Yang Yingliang --- net/packet/af_packet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 5756d30bc018..1afce8dcb4bb 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)) -- GitLab