mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Christian A. Ehrhardt" <lk@c--e.de>
To: David Howells <dhowells@redhat.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org
Cc: "Christian A. Ehrhardt" <lk@c--e.de>, Kees Cook <kees@kernel.org>,
	Petr Mladek <pmladek@suse.com>, David Gow <davidgow@google.com>
Subject: [PATCH v3 2/5] lib/scatterlist: Fix temp buffer in extract_user_to_sg()
Date: Thu, 26 Mar 2026 22:49:02 +0100	[thread overview]
Message-ID: <20260326214905.818170-3-lk@c--e.de> (raw)
In-Reply-To: <20260326214905.818170-1-lk@c--e.de>

Instead of allocating a temporary buffer for extracted
user pages extract_user_to_sg() uses the end of the
to be filled scatterlist as a temporary buffer.

Fix the calculation of the start address if the scatterlist
already contains elements. The unused space starts at
sgtable->sgl + sgtable->nents not directly at sgtable->nents
and the temporary buffer is placed at the end of this unused
space.

A subsequent commit will add kunit test cases that
demonstrate that the patch is necessary.

Pointed out by sashiko.dev on a previous iteration of this series.

Cc: David Howells <dhowells@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: stable@vger.kernel.org # v6.5+
Fixes: 018584697533 ("netfs: Add a function to extract an iterator into a scatterlist")
Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
---
 lib/scatterlist.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index befdc4b9c11d..b7fe91ef35b8 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -1123,8 +1123,7 @@ static ssize_t extract_user_to_sg(struct iov_iter *iter,
 	size_t len, off;
 
 	/* We decant the page list into the tail of the scatterlist */
-	pages = (void *)sgtable->sgl +
-		array_size(sg_max, sizeof(struct scatterlist));
+	pages = (void *)sg + array_size(sg_max, sizeof(struct scatterlist));
 	pages -= sg_max;
 
 	do {
-- 
2.43.0


  parent reply	other threads:[~2026-03-26 21:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-26 21:49 [PATCH v3 0/5] Fix bugs in extract_iter_to_sg() Christian A. Ehrhardt
2026-03-26 21:49 ` [PATCH v3 1/5] lib/scatterlist: Fix length calculations in extract_kvec_to_sg Christian A. Ehrhardt
2026-03-26 21:49 ` Christian A. Ehrhardt [this message]
2026-03-26 21:49 ` [PATCH v3 3/5] lib: kunit_iov_iter: Fix memory leaks Christian A. Ehrhardt
2026-03-26 21:49 ` [PATCH v3 4/5] lib: kunit_iov_iter: Improve error detection Christian A. Ehrhardt
2026-03-26 21:49 ` [PATCH v3 5/5] lib: kunit_iov_iter: Add tests for extract_iter_to_sg Christian A. Ehrhardt
2026-04-21  5:45   ` David Gow
2026-04-21  6:30     ` Christian A. Ehrhardt
2026-04-21  6:49       ` David Gow
2026-03-26 22:39 ` [PATCH v3 0/5] Fix bugs in extract_iter_to_sg() Andrew Morton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260326214905.818170-3-lk@c--e.de \
    --to=lk@c--e.de \
    --cc=akpm@linux-foundation.org \
    --cc=davidgow@google.com \
    --cc=dhowells@redhat.com \
    --cc=kees@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmladek@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®