]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.7-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Feb 2024 16:16:27 +0000 (17:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Feb 2024 16:16:27 +0000 (17:16 +0100)
added patches:
net-fix-from-address-in-memcpy_to_iter_csum.patch

queue-6.7/net-fix-from-address-in-memcpy_to_iter_csum.patch [new file with mode: 0644]
queue-6.7/series

diff --git a/queue-6.7/net-fix-from-address-in-memcpy_to_iter_csum.patch b/queue-6.7/net-fix-from-address-in-memcpy_to_iter_csum.patch
new file mode 100644 (file)
index 0000000..d25e256
--- /dev/null
@@ -0,0 +1,38 @@
+From fe92f874f09145a6951deacaa4961390238bbe0d Mon Sep 17 00:00:00 2001
+From: Michael Lass <bevan@bi-co.net>
+Date: Wed, 31 Jan 2024 16:52:20 +0100
+Subject: net: Fix from address in memcpy_to_iter_csum()
+
+From: Michael Lass <bevan@bi-co.net>
+
+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>
+---
+ net/core/datagram.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- 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 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;
index 8079a5cbf4e8287e8584949277834728c1dee64e..308d56f789e6c88a9af76878a88d74bf1f63d85d 100644 (file)
@@ -121,3 +121,4 @@ bcachefs-time_stats-check-for-last_event-0-when-updating-freq-stats.patch
 revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch
 io_uring-poll-add-requeue-return-code-from-poll-multishot-handling.patch
 io_uring-net-limit-inline-multishot-retries.patch
+net-fix-from-address-in-memcpy_to_iter_csum.patch