diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:20 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-06-13 09:29:16 -0400 |
| commit | dd07486ceba48b5d2157b212bb9bd5ce9a46b593 (patch) | |
| tree | 6f3c9f28ea410d2771f53a37cb2fa5941da51755 /net | |
| parent | c9d0eb33ba82ac82a12bdd4b66b33edbf5ac5e30 (diff) | |
net/packet: fix overflow in check for priv area size
[ Upstream commit 2b6867c2ce76c596676bec7d2d525af525fdc6e2 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/packet/af_packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index b9d1baaa8bdc..83c05aa95d5a 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -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))) goto out; if (po->tp_version >= TPACKET_V3 && - (int)(req->tp_block_size - - BLK_PLUS_PRIV(req_u->req3.tp_sizeof_priv)) <= 0) + req->tp_block_size <= + BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv)) goto out; if (unlikely(req->tp_frame_size < po->tp_hdrlen + po->tp_reserve)) |