diff options
| author | Alexei Starovoitov <ast@plumgrid.com> | 2013-11-12 22:39:13 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-08 15:29:11 (GMT) |
| commit | c7cf12c15986f580ce4f75ebbcbb8659eb96a506 (patch) | |
| tree | 15523ec85e0b8fe2e41f1ef6fe65cfee6b309733 /net/core/timestamping.c | |
| parent | db6b5bf758051d320b6b3363ddd515760010e527 (diff) | |
| download | linux-fsl-qoriq-c7cf12c15986f580ce4f75ebbcbb8659eb96a506.tar.xz | |
core/dev: do not ignore dmac in dev_forward_skb()
[ Upstream commit 81b9eab5ebbf0d5d54da4fc168cfb02c2adc76b8 ]
commit 06a23fe31ca3
("core/dev: set pkt_type after eth_type_trans() in dev_forward_skb()")
and refactoring 64261f230a91
("dev: move skb_scrub_packet() after eth_type_trans()")
are forcing pkt_type to be PACKET_HOST when skb traverses veth.
which means that ip forwarding will kick in inside netns
even if skb->eth->h_dest != dev->dev_addr
Fix order of eth_type_trans() and skb_scrub_packet() in dev_forward_skb()
and in ip_tunnel_rcv()
Fixes: 06a23fe31ca3 ("core/dev: set pkt_type after eth_type_trans() in dev_forward_skb()")
CC: Isaku Yamahata <yamahatanetdev@gmail.com>
CC: Maciej Zenczykowski <zenczykowski@gmail.com>
CC: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/timestamping.c')
0 files changed, 0 insertions, 0 deletions