diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:23:02 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:23:02 +0000 |
commit | 34b88683b77a3e6954aa8a1594546faec3cf143a (patch) | |
tree | 4096e266d5c05e29b43dbc9d8fcca4a3ffdb01a7 /net/core | |
parent | Releasing progress-linux version 6.9.8-1~progress7.99u1. (diff) | |
download | linux-34b88683b77a3e6954aa8a1594546faec3cf143a.tar.xz linux-34b88683b77a3e6954aa8a1594546faec3cf143a.zip |
Merging upstream version 6.9.9.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/datagram.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c index a8b625abe2..cb72923acc 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -435,15 +435,22 @@ static int __skb_datagram_iter(const struct sk_buff *skb, int offset, end = start + skb_frag_size(frag); if ((copy = end - offset) > 0) { - struct page *page = skb_frag_page(frag); - u8 *vaddr = kmap(page); + u32 p_off, p_len, copied; + struct page *p; + u8 *vaddr; if (copy > len) copy = len; - n = INDIRECT_CALL_1(cb, simple_copy_to_iter, - vaddr + skb_frag_off(frag) + offset - start, - copy, data, to); - kunmap(page); + + skb_frag_foreach_page(frag, + skb_frag_off(frag) + offset - start, + copy, p, p_off, p_len, copied) { + vaddr = kmap_local_page(p); + n = INDIRECT_CALL_1(cb, simple_copy_to_iter, + vaddr + p_off, p_len, data, to); + kunmap_local(vaddr); + } + offset += n; if (n != copy) goto short_copy; |