aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorJakub Kicinski <[email protected]>2025-07-02 22:07:18 +0000
committerJakub Kicinski <[email protected]>2025-07-02 22:07:18 +0000
commit285c895fba9e42dfdc9eea1c3001585d9ee58233 (patch)
tree5170087b9fb795ee9716a70f5f93543f03ad7894 /net/core/dev.c
parentMerge branch 'vsock-test-check-for-null-ptr-deref-when-transport-changes' (diff)
parentselftest: net: extend msg_zerocopy test with forwarding (diff)
downloadkernel-285c895fba9e42dfdc9eea1c3001585d9ee58233.tar.gz
kernel-285c895fba9e42dfdc9eea1c3001585d9ee58233.zip
Merge branch 'preserve-msg_zerocopy-with-forwarding'
Willem de Bruijn says: ==================== preserve MSG_ZEROCOPY with forwarding Avoid false positive copying of zerocopy skb frags when entering the ingress path if the skb is not queued locally but forwarded. Patch 1 for more details and feature. Patch 2 converts the existing selftest to a pass/fail test and adds coverage for this new feature. ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 7ee808eb068e..96d33dead604 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5937,8 +5937,6 @@ check_vlan_id:
}
if (pt_prev) {
- if (unlikely(skb_orphan_frags_rx(skb, GFP_ATOMIC)))
- goto drop;
*ppt_prev = pt_prev;
} else {
drop: