summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lass <bevan@bi-co.net>2024-01-31 16:52:20 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-02-16 19:14:32 +0100
commit50d0dff3f706ff4a71df99b7526341ae9fa83e09 (patch)
treea8566ac4ea0c60575fb5370ee65023da771e9bdd
parent3438de322e549183126d9bafe131e9dd80348811 (diff)
net: Fix from address in memcpy_to_iter_csum()
commit fe92f874f09145a6951deacaa4961390238bbe0d upstream. While inlining csum_and_memcpy() into memcpy_to_iter_csum(), the from address passed to csum_partial_copy_nocheck() was accidentally changed. This causes a regression in applications using UDP, as for example OpenAFS, causing loss of datagrams. Fixes: dc32bff195b4 ("iov_iter, net: Fold in csum_and_memcpy()") Cc: David Howells <dhowells@redhat.com> Cc: stable@vger.kernel.org Cc: regressions@lists.linux.dev Signed-off-by: Michael Lass <bevan@bi-co.net> Reviewed-by: Jeffrey Altman <jaltman@auristor.com> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/core/datagram.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 103d46fa0eeb..a8b625abe242 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -751,7 +751,7 @@ size_t memcpy_to_iter_csum(void *iter_to, size_t progress,
size_t len, void *from, void *priv2)
{
__wsum *csum = priv2;
- __wsum next = csum_partial_copy_nocheck(from, iter_to, len);
+ __wsum next = csum_partial_copy_nocheck(from + progress, iter_to, len);
*csum = csum_block_add(*csum, next, progress);
return 0;