Skip to content

Commit 07b7d66

Browse files
Christian A. Ehrhardtakpm00
authored andcommitted
lib/scatterlist: fix length calculations in extract_kvec_to_sg
Patch series "Fix bugs in extract_iter_to_sg()", v3. Fix bugs in the kvec and user variants of extract_iter_to_sg. This series is growing due to useful remarks made by sashiko.dev. The main bugs are: - The length for an sglist entry when extracting from a kvec can exceed the number of bytes in the page. This is obviously not intended. - When extracting a user buffer the sglist is temporarily used as a scratch buffer for extracted page pointers. If the sglist already contains some elements this scratch buffer could overlap with existing entries in the sglist. The series adds test cases to the kunit_iov_iter test that demonstrate all of these bugs. Additionally, there is a memory leak fix for the test itself. The bugs were orignally introduced into kernel v6.3 where the function lived in fs/netfs/iterator.c. It was later moved to lib/scatterlist.c in v6.5. Thus the actual fix is only marked for backports to v6.5+. This patch (of 5): When extracting from a kvec to a scatterlist, do not cross page boundaries. The required length was already calculated but not used as intended. Adjust the copied length if the loop runs out of sglist entries without extracting everything. While there, return immediately from extract_iter_to_sg if there are no sglist entries at all. A subsequent commit will add kunit test cases that demonstrate that the patch is necessary. Link: https://lkml.kernel.org/r/20260326214905.818170-1-lk@c--e.de Link: https://lkml.kernel.org/r/20260326214905.818170-2-lk@c--e.de Fixes: 0185846 ("netfs: Add a function to extract an iterator into a scatterlist") Signed-off-by: Christian A. Ehrhardt <lk@c--e.de> Cc: David Gow <davidgow@google.com> Cc: David Howells <dhowells@redhat.com> Cc: Kees Cook <kees@kernel.org> Cc: Petr Mladek <pmladek@suse.com> Cc: <stable@vger.kernel.org> [v6.5+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 86bda53 commit 07b7d66

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

lib/scatterlist.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,7 @@ static ssize_t extract_kvec_to_sg(struct iov_iter *iter,
12471247
else
12481248
page = virt_to_page((void *)kaddr);
12491249

1250-
sg_set_page(sg, page, len, off);
1250+
sg_set_page(sg, page, seg, off);
12511251
sgtable->nents++;
12521252
sg++;
12531253
sg_max--;
@@ -1256,6 +1256,7 @@ static ssize_t extract_kvec_to_sg(struct iov_iter *iter,
12561256
kaddr += PAGE_SIZE;
12571257
off = 0;
12581258
} while (len > 0 && sg_max > 0);
1259+
ret -= len;
12591260

12601261
if (maxsize <= 0 || sg_max == 0)
12611262
break;
@@ -1409,7 +1410,7 @@ ssize_t extract_iter_to_sg(struct iov_iter *iter, size_t maxsize,
14091410
struct sg_table *sgtable, unsigned int sg_max,
14101411
iov_iter_extraction_t extraction_flags)
14111412
{
1412-
if (maxsize == 0)
1413+
if (maxsize == 0 || sg_max == 0)
14131414
return 0;
14141415

14151416
switch (iov_iter_type(iter)) {

0 commit comments

Comments
 (0)