Commit 49a4be2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'exfat-for-6.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat 

Pull exfat fix from Namjae Jeon:

 - Fix BUG in iov_iter_revert reported from syzbot

* tag 'exfat-for-6.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
  exfat: fix zero the unwritten part for dio read
parents 5c24e4e9 0991abed

fs/exfat/inode.c

+3 −4
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static ssize_t exfat_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
	struct inode *inode = mapping->host;

	struct exfat_inode_info *ei = EXFAT_I(inode);

	loff_t pos = iocb->ki_pos;

	loff_t size = iocb->ki_pos + iov_iter_count(iter);

	loff_t size = pos + iov_iter_count(iter);

	int rw = iov_iter_rw(iter);

	ssize_t ret;
@@ -525,10 +525,9 @@ static ssize_t exfat_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
	 */

	ret = blockdev_direct_IO(iocb, inode, iter, exfat_get_block);

	if (ret < 0) {

		if (rw == WRITE)

		if (rw == WRITE && ret != -EIOCBQUEUED)

			exfat_write_failed(mapping, size);



		if (ret != -EIOCBQUEUED)

		return ret;

	} else

		size = pos + ret;