OSDN Git Service

Merge branch 'skb-headroom-slab-out-of-bounds'
authorDavid S. Miller <davem@davemloft.net>
Sat, 8 Dec 2018 00:24:40 +0000 (16:24 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 8 Dec 2018 00:24:40 +0000 (16:24 -0800)
commit8b78903bc5f1786f7f988d26de48819144a13d6c
tree9b93e099315cb036f69df1d45cac0e98de166976
parentf9bfe4e6a9d08d405fe7b081ee9a13e649c97ecf
parente6ac64d4c4d095085d7dd71cbd05704ac99829b2
Merge branch 'skb-headroom-slab-out-of-bounds'

Stefano Brivio says:

====================
Fix slab out-of-bounds on insufficient headroom for IPv6 packets

Patch 1/2 fixes a slab out-of-bounds occurring with short SCTP packets over
IPv4 over L2TP over IPv6 on a configuration with relatively low HEADER_MAX.

Patch 2/2 makes sure we avoid writing before the allocated buffer in
neigh_hh_output() in case the headroom is enough for the unaligned hardware
header size, but not enough for the aligned one, and that we warn if we hit
this condition.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>