OSDN Git Service

bpf/cpumap: make sure frame_size for build_skb is aligned if headroom isn't
authorJesper Dangaard Brouer <brouer@redhat.com>
Wed, 19 Dec 2018 16:00:23 +0000 (17:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 08:20:46 +0000 (09:20 +0100)
commitf0910af753bd885152c2e23fcd67000d41e9711f
tree28a43dfbe1458eb2e1bb11facab6efeb1f559970
parentf48c240cbff66d9fac4d5557b48bd4bdda13aef2
bpf/cpumap: make sure frame_size for build_skb is aligned if headroom isn't

[ Upstream commit 77ea5f4cbe2084db9ab021ba73fb7eadf1610884 ]

The frame_size passed to build_skb must be aligned, else it is
possible that the embedded struct skb_shared_info gets unaligned.

For correctness make sure that xdpf->headroom in included in the
alignment. No upstream drivers can hit this, as all XDP drivers provide
an aligned headroom.  This was discovered when playing with implementing
XDP support for mvneta, which have a 2 bytes DSA header, and this
Marvell ARM64 platform didn't like doing atomic operations on an
unaligned skb_shinfo(skb)->dataref addresses.

Fixes: 1c601d829ab0 ("bpf: cpumap xdp_buff to skb conversion and allocation")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/bpf/cpumap.c