OSDN Git Service

UPSTREAM: net/packet: fix overflow in check for priv area size
authorAndrey Konovalov <andreyknvl@google.com>
Wed, 29 Mar 2017 14:11:20 +0000 (16:11 +0200)
committerTodd Poynor <toddpoynor@google.com>
Fri, 14 Apr 2017 00:46:32 +0000 (17:46 -0700)
commit8affe1f70379abeafb9bc1ee81132beae3e76b93
treee8c7f28bc6aa5ff6de14ca9b01431ecc98752722
parente3b87b234b324552302f3a47c1dbcfae9423188d
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
net/packet/af_packet.c