5.4-stable patches

added patches:
	ext4-correct-inline-offset-when-handling-xattrs-in-inode-body.patch

diff --git a/queue-5.4/ext4-correct-inline-offset-when-handling-xattrs-in-inode-body.patch b/queue-5.4/ext4-correct-inline-offset-when-handling-xattrs-in-inode-body.patch
new file mode 100644 (file)
index 0000000..6ecfb89
--- /dev/null
+++ b/queue-5.4/ext4-correct-inline-offset-when-handling-xattrs-in-inode-body.patch
@@ -0,0 +1,54 @@
+From 6909cf5c4101214f4305a62d582a5b93c7e1eb9a Mon Sep 17 00:00:00 2001
+From: Eric Whitney <enwlinux@gmail.com>
+Date: Mon, 22 May 2023 14:15:20 -0400
+Subject: ext4: correct inline offset when handling xattrs in inode body
+
+From: Eric Whitney <enwlinux@gmail.com>
+
+commit 6909cf5c4101214f4305a62d582a5b93c7e1eb9a upstream.
+
+When run on a file system where the inline_data feature has been
+enabled, xfstests generic/269, generic/270, and generic/476 cause ext4
+to emit error messages indicating that inline directory entries are
+corrupted.  This occurs because the inline offset used to locate
+inline directory entries in the inode body is not updated when an
+xattr in that shared region is deleted and the region is shifted in
+memory to recover the space it occupied.  If the deleted xattr precedes
+the system.data attribute, which points to the inline directory entries,
+that attribute will be moved further up in the region.  The inline
+offset continues to point to whatever is located in system.data's former
+location, with unfortunate effects when used to access directory entries
+or (presumably) inline data in the inode body.
+
+Cc: stable@kernel.org
+Signed-off-by: Eric Whitney <enwlinux@gmail.com>
+Link: https://lore.kernel.org/r/20230522181520.1570360-1-enwlinux@gmail.com
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ext4/xattr.c |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -1742,6 +1742,20 @@ static int ext4_xattr_set_entry(struct e
+               memmove(here, (void *)here + size,
+                       (void *)last - (void *)here + sizeof(__u32));
+               memset(last, 0, size);
++
++              /*
++               * Update i_inline_off - moved ibody region might contain
++               * system.data attribute.  Handling a failure here won't
++               * cause other complications for setting an xattr.
++               */
++              if (!is_block && ext4_has_inline_data(inode)) {
++                      ret = ext4_find_inline_data_nolock(inode);
++                      if (ret) {
++                              ext4_warning_inode(inode,
++                                      "unable to update i_inline_off");
++                              goto out;
++                      }
++              }
+       } else if (s->not_found) {
+               /* Insert new name. */
+               size_t size = EXT4_XATTR_LEN(name_len);

diff --git a/queue-5.4/series b/queue-5.4/series
index a91822c4c7d4f3a97b1f14ad8249d5d8e04020c5..4f6a54976431da3091d0d32e54d0d133d9206d4b 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -281,3 +281,4 @@ selftests-tc-set-timeout-to-15-minutes.patch
 can-bcm-fix-uaf-in-bcm_proc_show.patch
 drm-client-fix-memory-leak-in-drm_client_target_cloned.patch
 drm-client-fix-memory-leak-in-drm_client_modeset_probe.patch
+ext4-correct-inline-offset-when-handling-xattrs-in-inode-body.patch