Unverified Commit 3ff93c59 authored by Christian Brauner's avatar Christian Brauner
Browse files

Merge tag 'fuse-fixes-6.13-rc7' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

Pull fuse fixes from Miklos Szeredi <mszeredi@redhat.com>:

- Fix fuse_get_user_pages() allocation failure handling.

- Fix direct-io folio offset and length calculation.

* tag 'fuse-fixes-6.13-rc7' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: Set *nbytesp=0 in fuse_get_user_pages on allocation failure
  fuse: fix direct io folio offset and length calculation

Link: https://lore.kernel.org/r/CAJfpegu7o_X%3DSBWk_C47dUVUQ1mJZDEGe1MfD0N3wVJoUBWdmg@mail.gmail.com


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parents fbfd64d2 78f2560f

fs/fuse/file.c

+19 −12
Original line number Diff line number Diff line
@@ -1541,8 +1541,10 @@ static int fuse_get_user_pages(struct fuse_args_pages *ap, struct iov_iter *ii, 
	 */

	struct page **pages = kzalloc(max_pages * sizeof(struct page *),

				      GFP_KERNEL);

	if (!pages)

		return -ENOMEM;

	if (!pages) {

		ret = -ENOMEM;

		goto out;

	}



	while (nbytes < *nbytesp && nr_pages < max_pages) {

		unsigned nfolios, i;
@@ -1557,18 +1559,22 @@ static int fuse_get_user_pages(struct fuse_args_pages *ap, struct iov_iter *ii, 


		nbytes += ret;



		ret += start;

		/* Currently, all folios in FUSE are one page */

		nfolios = DIV_ROUND_UP(ret, PAGE_SIZE);

		nfolios = DIV_ROUND_UP(ret + start, PAGE_SIZE);



		ap->descs[ap->num_folios].offset = start;

		fuse_folio_descs_length_init(ap->descs, ap->num_folios, nfolios);

		for (i = 0; i < nfolios; i++)

			ap->folios[i + ap->num_folios] = page_folio(pages[i]);

		for (i = 0; i < nfolios; i++) {

			struct folio *folio = page_folio(pages[i]);

			unsigned int offset = start +

				(folio_page_idx(folio, pages[i]) << PAGE_SHIFT);

			unsigned int len = min_t(unsigned int, ret, PAGE_SIZE - start);



			ap->descs[ap->num_folios].offset = offset;

			ap->descs[ap->num_folios].length = len;

			ap->folios[ap->num_folios] = folio;

			start = 0;

			ret -= len;

			ap->num_folios++;

		}



		ap->num_folios += nfolios;

		ap->descs[ap->num_folios - 1].length -=

			(PAGE_SIZE - ret) & (PAGE_SIZE - 1);

		nr_pages += nfolios;

	}

	kfree(pages);
@@ -1584,6 +1590,7 @@ static int fuse_get_user_pages(struct fuse_args_pages *ap, struct iov_iter *ii, 
	else

		ap->args.out_pages = true;



out:

	*nbytesp = nbytes;



	return ret < 0 ? ret : 0;