]> git.ipfire.org Git - people/ms/linux.git/commit
macvtap: make sure neighbour code can push ethernet header
authorEric Dumazet <edumazet@google.com>
Sat, 28 Feb 2015 02:35:35 +0000 (18:35 -0800)
committerJiri Slaby <jslaby@suse.cz>
Thu, 12 Mar 2015 09:06:27 +0000 (10:06 +0100)
commit2b6de7d31c8dab3c4e2b0c0883fb19d27ce73ebb
tree25c52868024f26b0e2e276de6aa7bc862cbd653e
parenta835f60198e521de246a585cc81a5719a9a86ece
macvtap: make sure neighbour code can push ethernet header

[ Upstream commit 2f1d8b9e8afa5a833d96afcd23abcb8cdf8d83ab ]

Brian reported crashes using IPv6 traffic with macvtap/veth combo.

I tracked the crashes in neigh_hh_output()

-> memcpy(skb->data - HH_DATA_MOD, hh->hh_data, HH_DATA_MOD);

Neighbour code assumes headroom to push Ethernet header is
at least 16 bytes.

It appears macvtap has only 14 bytes available on arches
where NET_IP_ALIGN is 0 (like x86)

Effect is a corruption of 2 bytes right before skb->head,
and possible crashes if accessing non existing memory.

This fix should also increase IPv4 performance, as paranoid code
in ip_finish_output2() wont have to call skb_realloc_headroom()

Reported-by: Brian Rak <brak@vultr.com>
Tested-by: Brian Rak <brak@vultr.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/net/macvtap.c