From: Greg Kroah-Hartman Date: Thu, 21 May 2026 10:51:05 +0000 (+0200) Subject: 6.18-stable patches X-Git-Tag: v6.6.141~26 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=436e89dc80d7dd4fb52b1200e1d50a401f4fc1a1;p=thirdparty%2Fkernel%2Fstable-queue.git 6.18-stable patches added patches: net-rds-reset-op_nents-when-zerocopy-page-pin-fails.patch --- diff --git a/queue-6.18/net-rds-reset-op_nents-when-zerocopy-page-pin-fails.patch b/queue-6.18/net-rds-reset-op_nents-when-zerocopy-page-pin-fails.patch new file mode 100644 index 0000000000..359cbbf818 --- /dev/null +++ b/queue-6.18/net-rds-reset-op_nents-when-zerocopy-page-pin-fails.patch @@ -0,0 +1,41 @@ +From e174929793195e0cd6a4adb0cad731b39f9019b4 Mon Sep 17 00:00:00 2001 +From: Allison Henderson +Date: Tue, 5 May 2026 16:43:36 -0700 +Subject: net/rds: reset op_nents when zerocopy page pin fails + +From: Allison Henderson + +commit e174929793195e0cd6a4adb0cad731b39f9019b4 upstream. + +When iov_iter_get_pages2() fails in rds_message_zcopy_from_user(), +the pinned pages are released with put_page(), and +rm->data.op_mmp_znotifier is cleared. But we fail to properly +clear rm->data.op_nents. + +Later when rds_message_purge() is called from rds_sendmsg() the +cleanup loop iterates over the incorrectly non zero number of +op_nents and frees them again. + +Fix this by properly resetting op_nents when it should be in +rds_message_zcopy_from_user(). + +Fixes: 0cebaccef3ac ("rds: zerocopy Tx support.") +Signed-off-by: Allison Henderson +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20260505234336.2132721-1-achender@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/rds/message.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/rds/message.c ++++ b/net/rds/message.c +@@ -408,6 +408,7 @@ static int rds_message_zcopy_from_user(s + + for (i = 0; i < rm->data.op_nents; i++) + put_page(sg_page(&rm->data.op_sg[i])); ++ rm->data.op_nents = 0; + mmp = &rm->data.op_mmp_znotifier->z_mmp; + mm_unaccount_pinned_pages(mmp); + ret = -EFAULT; diff --git a/queue-6.18/series b/queue-6.18/series index 0d4cbc1ff3..2d399e71e0 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -955,3 +955,4 @@ sched_ext-pass-held-rq-to-scx_call_op-for-core_sched_before.patch f2fs-fix-false-alarm-of-lockdep-on-cp_global_sem-lock.patch spi-sifive-simplify-clock-handling-with-devm_clk_get_enabled.patch spi-sifive-fix-controller-deregistration.patch +net-rds-reset-op_nents-when-zerocopy-page-pin-fails.patch