Commit 45088963 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull exfat fixes from Namjae Jeon:

 - Fix potential memory leak in exfat_find

 - Set exfat's splice_write to iter_file_splice_write to fix a splice
   failure on direct-opened files

* tag 'for-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
  exfat: fix possible memory leak in exfat_find()
  exfat: use iter_file_splice_write
parents 9d1be4f4 94182167
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ const struct file_operations exfat_file_operations = {
	.mmap		= generic_file_mmap,
	.fsync		= generic_file_fsync,
	.splice_read	= generic_file_splice_read,
	.splice_write	= iter_file_splice_write,
};

const struct inode_operations exfat_file_inode_operations = {
+1 −0
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ static int exfat_find(struct inode *dir, struct qstr *qname,
			exfat_fs_error(sb,
				"non-zero size file starts with zero cluster (size : %llu, p_dir : %u, entry : 0x%08x)",
				i_size_read(dir), ei->dir.dir, ei->entry);
			kfree(es);
			return -EIO;
		}