summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPengtao He <hept.hept.hept@gmail.com>2025-08-19 10:15:51 +0800
committerJakub Kicinski <kuba@kernel.org>2025-08-20 19:24:17 -0700
commit8f2c72f2252cf228879de0224d5055470fc20c06 (patch)
treefc688f19c90fbd0f6aba0f0fc2ca1175fccd7f6b
parentc3199adbe4ffffc7b6536715e0290d1919a45cd9 (diff)
net: avoid one loop iteration in __skb_splice_bits
If *len is equal to 0 at the beginning of __splice_segment it returns true directly. But when decreasing *len from a positive number to 0 in __splice_segment, it returns false. The __skb_splice_bits needs to call __splice_segment again. Recheck *len if it changes, return true in time. Reduce unnecessary calls to __splice_segment. Signed-off-by: Pengtao He <hept.hept.hept@gmail.com> Reviewed-by: Willem de Bruijn <willemb@google.com> Link: https://patch.msgid.link/20250819021551.8361-1-hept.hept.hept@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--net/core/skbuff.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index ee0274417948..23b776cd9879 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3112,7 +3112,9 @@ static bool __splice_segment(struct page *page, unsigned int poff,
poff += flen;
plen -= flen;
*len -= flen;
- } while (*len && plen);
+ if (!*len)
+ return true;
+ } while (plen);
return false;
}