diff options
| author | Nicolas Dichtel <[email protected]> | 2021-06-24 08:05:05 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2021-06-25 18:04:39 +0000 |
| commit | ff70202b2d1ad522275c6aadc8c53519b6a22c57 (patch) | |
| tree | 0271645465d1680a127b48238d9d355d9753c114 /net/tipc/node.c | |
| parent | net: dsa: sja1105: fix NULL pointer dereference in sja1105_reload_cbs() (diff) | |
| download | kernel-ff70202b2d1ad522275c6aadc8c53519b6a22c57.tar.gz kernel-ff70202b2d1ad522275c6aadc8c53519b6a22c57.zip | |
dev_forward_skb: do not scrub skb mark within the same name space
The goal is to keep the mark during a bpf_redirect(), like it is done for
legacy encapsulation / decapsulation, when there is no x-netns.
This was initially done in commit 213dd74aee76 ("skbuff: Do not scrub skb
mark within the same name space").
When the call to skb_scrub_packet() was added in dev_forward_skb() (commit
8b27f27797ca ("skb: allow skb_scrub_packet() to be used by tunnels")), the
second argument (xnet) was set to true to force a call to skb_orphan(). At
this time, the mark was always cleanned up by skb_scrub_packet(), whatever
xnet value was.
This call to skb_orphan() was removed later in commit
9c4c325252c5 ("skbuff: preserve sock reference when scrubbing the skb.").
But this 'true' stayed here without any real reason.
Let's correctly set xnet in ____dev_forward_skb(), this function has access
to the previous interface and to the new interface.
Signed-off-by: Nicolas Dichtel <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/tipc/node.c')
0 files changed, 0 insertions, 0 deletions