Skip to content

Commit acb7112

Browse files
pcacjrgregkh
authored andcommitted
netfs: fix error handling in netfs_extract_user_iter()
commit 0aad570 upstream. In netfs_extract_user_iter(), if iov_iter_extract_pages() failed to extract user pages, bail out on -ENOMEM, otherwise return the error code only if @npages == 0, allowing short DIO reads and writes to be issued. This fixes mmapstress02 from LTP tests against CIFS. Fixes: 85dd2c8 ("netfs: Add a function to extract a UBUF or IOVEC into a BVEC iterator") Reported-by: Xiaoli Feng <xifeng@redhat.com> Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.org> Signed-off-by: David Howells <dhowells@redhat.com> Link: https://patch.msgid.link/20260512123404.719402-10-dhowells@redhat.com Cc: netfs@lists.linux.dev Cc: stable@vger.kernel.org Cc: linux-cifs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 76dc39f commit acb7112

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

fs/netfs/iterator.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
* Extract the page fragments from the given amount of the source iterator and
2424
* build up a second iterator that refers to all of those bits. This allows
25-
* the original iterator to disposed of.
25+
* the original iterator to be disposed of.
2626
*
2727
* @extraction_flags can have ITER_ALLOW_P2PDMA set to request peer-to-peer DMA be
2828
* allowed on the pages extracted.
@@ -67,8 +67,8 @@ ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len,
6767
ret = iov_iter_extract_pages(orig, &pages, count,
6868
max_pages - npages, extraction_flags,
6969
&offset);
70-
if (ret < 0) {
71-
pr_err("Couldn't get user pages (rc=%zd)\n", ret);
70+
if (unlikely(ret <= 0)) {
71+
ret = ret ?: -EIO;
7272
break;
7373
}
7474

@@ -97,6 +97,13 @@ ssize_t netfs_extract_user_iter(struct iov_iter *orig, size_t orig_len,
9797
npages += cur_npages;
9898
}
9999

100+
if (ret < 0 && (ret == -ENOMEM || npages == 0)) {
101+
for (i = 0; i < npages; i++)
102+
unpin_user_page(bv[i].bv_page);
103+
kvfree(bv);
104+
return ret;
105+
}
106+
100107
iov_iter_bvec(new, orig->data_source, bv, npages, orig_len - count);
101108
return npages;
102109
}

0 commit comments

Comments
 (0)