openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrey Konovalov 2017-03-29 16:11:20 +02:00 committed by David S. Miller
parent 8f1f7eeb22
commit 2b6867c2ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/packet/af_packet.c
View File

@ -4193,8 +4193,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
if (unlikely(!PAGE_ALIGNED(req->tp_block_size))) if (unlikely(!PAGE_ALIGNED(req->tp_block_size)))
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))