Commit 5722119f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iomap-6.6-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull iomap fix from Darrick Wong:

 - Fix a bug where a writev consisting of a bunch of sub-fsblock writes
   where the last buffer address is invalid could lead to an infinite
   loop

* tag 'iomap-6.6-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: fix short copy in iomap_write_iter()
parents 9c5d00cb 3ac97479

fs/iomap/buffered-io.c

+7 −3
Original line number Diff line number Diff line
@@ -881,8 +881,10 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i) 
		size_t bytes;		/* Bytes to write to folio */

		size_t copied;		/* Bytes copied from user */



		bytes = iov_iter_count(i);

retry:

		offset = pos & (chunk - 1);

		bytes = min(chunk - offset, iov_iter_count(i));

		bytes = min(chunk - offset, bytes);

		status = balance_dirty_pages_ratelimited_flags(mapping,

							       bdp_flags);

		if (unlikely(status))
@@ -933,10 +935,12 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i) 
			 * halfway through, might be a race with munmap,

			 * might be severe memory pressure.

			 */

			if (copied)

				bytes = copied;

			if (chunk > PAGE_SIZE)

				chunk /= 2;

			if (copied) {

				bytes = copied;

				goto retry;

			}

		} else {

			pos += status;

			written += status;