Commit dd07486c authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Sasha Levin

net/packet: fix overflow in check for priv area size

[ Upstream commit 2b6867c2 ]

Subtracting tp_sizeof_priv from tp_block_size and casting to int
to check whether one is less then the other doesn't always work
(both of them are unsigned ints).

Compare them as is instead.

Also cast tp_sizeof_priv to u64 before using BLK_PLUS_PRIV, as
it can overflow inside BLK_PLUS_PRIV otherwise.
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent c9d0eb33
...@@ -3867,8 +3867,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, ...@@ -3867,8 +3867,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
if (unlikely(req->tp_block_size & (PAGE_SIZE - 1))) if (unlikely(req->tp_block_size & (PAGE_SIZE - 1)))
goto out; goto out;
if (po->tp_version >= TPACKET_V3 && if (po->tp_version >= TPACKET_V3 &&
(int)(req->tp_block_size - req->tp_block_size <=
BLK_PLUS_PRIV(req_u->req3.tp_sizeof_priv)) <= 0) BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv))
goto out; goto out;
if (unlikely(req->tp_frame_size < po->tp_hdrlen + if (unlikely(req->tp_frame_size < po->tp_hdrlen +
po->tp_reserve)) po->tp_reserve))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment