Skip to content

Commit 2b6867c

Browse files
xairydavem330
authored andcommitted
net/packet: fix overflow in check for priv area size
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: Andrey Konovalov <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 8f1f7ee commit 2b6867c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/packet/af_packet.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4193,8 +4193,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
41934193
if (unlikely(!PAGE_ALIGNED(req->tp_block_size)))
41944194
goto out;
41954195
if (po->tp_version >= TPACKET_V3 &&
4196-
(int)(req->tp_block_size -
4197-
BLK_PLUS_PRIV(req_u->req3.tp_sizeof_priv)) <= 0)
4196+
req->tp_block_size <=
4197+
BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv))
41984198
goto out;
41994199
if (unlikely(req->tp_frame_size < po->tp_hdrlen +
42004200
po->tp_reserve))

0 commit comments

Comments
 (0)