diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-03-29 16:11:20 +0200 |
|---|---|---|
| committer | Stuart Scott <stuartscott@google.com> | 2017-05-16 22:37:22 +0000 |
| commit | 87a5ae8e36ef9c5aa439bd2d2468a3b4390340d5 (patch) | |
| tree | e60150d1d4cc77b072c53e8ba938f1ce8436887b | |
| parent | ee96cdbd394ff065a5dabcd26a588e4f85c34624 (diff) | |
| download | x86_64-87a5ae8e36ef9c5aa439bd2d2468a3b4390340d5.tar.gz | |
UPSTREAM: 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.
Bug: 36725304
Upstream commit: 2b6867c2ce76c596676bec7d2d525af525fdc6e2
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Change-Id: I46bfbaf5f4a5d80f10ddce731a3030f191de4b28
| -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 1653a72eb941..f176ee2d86b9 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3637,8 +3637,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)) |