5.14-stable patches

added patches:
	ext4-fix-e2fsprogs-checksum-failure-for-mounted-filesystem.patch
	ext4-fix-race-writing-to-an-inline_data-file-while-its-xattrs-are-changing.patch

diff --git a/queue-5.14/ext4-fix-e2fsprogs-checksum-failure-for-mounted-filesystem.patch b/queue-5.14/ext4-fix-e2fsprogs-checksum-failure-for-mounted-filesystem.patch
new file mode 100644 (file)
index 0000000..0e7b014
--- /dev/null
+++ b/queue-5.14/ext4-fix-e2fsprogs-checksum-failure-for-mounted-filesystem.patch
@@ -0,0 +1,49 @@
+From b2bbb92f7042e8075fb036bf97043339576330c3 Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack@suse.cz>
+Date: Thu, 12 Aug 2021 14:47:37 +0200
+Subject: ext4: fix e2fsprogs checksum failure for mounted filesystem
+
+From: Jan Kara <jack@suse.cz>
+
+commit b2bbb92f7042e8075fb036bf97043339576330c3 upstream.
+
+Commit 81414b4dd48 ("ext4: remove redundant sb checksum
+recomputation") removed checksum recalculation after updating
+superblock free space / inode counters in ext4_fill_super() based on
+the fact that we will recalculate the checksum on superblock
+writeout.
+
+That is correct assumption but until the writeout happens (which can
+take a long time) the checksum is incorrect in the buffer cache and if
+programs such as tune2fs or resize2fs is called shortly after a file
+system is mounted can fail.  So return back the checksum recalculation
+and add a comment explaining why.
+
+Fixes: 81414b4dd48f ("ext4: remove redundant sb checksum recomputation")
+Cc: stable@kernel.org
+Reported-by: Boyang Xue <bxue@redhat.com>
+Signed-off-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Link: https://lore.kernel.org/r/20210812124737.21981-1-jack@suse.cz
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ext4/super.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -5032,6 +5032,14 @@ no_journal:
+               err = percpu_counter_init(&sbi->s_freeinodes_counter, freei,
+                                         GFP_KERNEL);
+       }
++      /*
++       * Update the checksum after updating free space/inode
++       * counters.  Otherwise the superblock can have an incorrect
++       * checksum in the buffer cache until it is written out and
++       * e2fsprogs programs trying to open a file system immediately
++       * after it is mounted can fail.
++       */
++      ext4_superblock_csum_set(sb);
+       if (!err)
+               err = percpu_counter_init(&sbi->s_dirs_counter,
+                                         ext4_count_dirs(sb), GFP_KERNEL);

diff --git a/queue-5.14/ext4-fix-race-writing-to-an-inline_data-file-while-its-xattrs-are-changing.patch b/queue-5.14/ext4-fix-race-writing-to-an-inline_data-file-while-its-xattrs-are-changing.patch
new file mode 100644 (file)
index 0000000..585314d
--- /dev/null
+++ b/queue-5.14/ext4-fix-race-writing-to-an-inline_data-file-while-its-xattrs-are-changing.patch
@@ -0,0 +1,42 @@
+From a54c4613dac1500b40e4ab55199f7c51f028e848 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Fri, 20 Aug 2021 23:44:17 -0400
+Subject: ext4: fix race writing to an inline_data file while its xattrs are changing
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+commit a54c4613dac1500b40e4ab55199f7c51f028e848 upstream.
+
+The location of the system.data extended attribute can change whenever
+xattr_sem is not taken.  So we need to recalculate the i_inline_off
+field since it mgiht have changed between ext4_write_begin() and
+ext4_write_end().
+
+This means that caching i_inline_off is probably not helpful, so in
+the long run we should probably get rid of it and shrink the in-memory
+ext4 inode slightly, but let's fix the race the simple way for now.
+
+Cc: stable@kernel.org
+Fixes: f19d5870cbf72 ("ext4: add normal write support for inline data")
+Reported-by: syzbot+13146364637c7363a7de@syzkaller.appspotmail.com
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ext4/inline.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/fs/ext4/inline.c
++++ b/fs/ext4/inline.c
+@@ -750,6 +750,12 @@ int ext4_write_inline_data_end(struct in
+       ext4_write_lock_xattr(inode, &no_expand);
+       BUG_ON(!ext4_has_inline_data(inode));
+ 
++      /*
++       * ei->i_inline_off may have changed since ext4_write_begin()
++       * called ext4_try_to_write_inline_data()
++       */
++      (void) ext4_find_inline_data_nolock(inode);
++
+       kaddr = kmap_atomic(page);
+       ext4_write_inline_data(inode, &iloc, kaddr, pos, len);
+       kunmap_atomic(kaddr);