]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Jun 2023 08:42:44 +0000 (10:42 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Jun 2023 08:42:44 +0000 (10:42 +0200)
added patches:
ext4-only-check-dquot_initialize_needed-when-debugging.patch

queue-4.19/ext4-only-check-dquot_initialize_needed-when-debugging.patch [new file with mode: 0644]
queue-4.19/series

diff --git a/queue-4.19/ext4-only-check-dquot_initialize_needed-when-debugging.patch b/queue-4.19/ext4-only-check-dquot_initialize_needed-when-debugging.patch
new file mode 100644 (file)
index 0000000..46bef8a
--- /dev/null
@@ -0,0 +1,47 @@
+From dea9d8f7643fab07bf89a1155f1f94f37d096a5e Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Thu, 8 Jun 2023 10:06:40 -0400
+Subject: ext4: only check dquot_initialize_needed() when debugging
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+commit dea9d8f7643fab07bf89a1155f1f94f37d096a5e upstream.
+
+ext4_xattr_block_set() relies on its caller to call dquot_initialize()
+on the inode.  To assure that this has happened there are WARN_ON
+checks.  Unfortunately, this is subject to false positives if there is
+an antagonist thread which is flipping the file system at high rates
+between r/o and rw.  So only do the check if EXT4_XATTR_DEBUG is
+enabled.
+
+Link: https://lore.kernel.org/r/20230608044056.GA1418535@mit.edu
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ext4/xattr.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -2041,8 +2041,9 @@ inserted:
+                       else {
+                               u32 ref;
++#ifdef EXT4_XATTR_DEBUG
+                               WARN_ON_ONCE(dquot_initialize_needed(inode));
+-
++#endif
+                               /* The old block is released after updating
+                                  the inode. */
+                               error = dquot_alloc_block(inode,
+@@ -2104,8 +2105,9 @@ inserted:
+                       /* We need to allocate a new block */
+                       ext4_fsblk_t goal, block;
++#ifdef EXT4_XATTR_DEBUG
+                       WARN_ON_ONCE(dquot_initialize_needed(inode));
+-
++#endif
+                       goal = ext4_group_first_block_no(sb,
+                                               EXT4_I(inode)->i_block_group);
+                       block = ext4_new_meta_blocks(handle, inode, goal, 0,
index 43c9184066be43e2f26f4bfa6d67434f2480542d..dbd25e871ceb8b2db8f2524f32b373858c522325 100644 (file)
@@ -17,3 +17,4 @@ ceph-fix-use-after-free-bug-for-inodes-when-flushing-capsnaps.patch
 bluetooth-fix-use-after-free-in-hci_remove_ltk-hci_remove_irk.patch
 pinctrl-meson-axg-add-missing-gpioa_18-gpio-group.patch
 i2c-sprd-delete-i2c-adapter-in-.remove-s-error-path.patch
+ext4-only-check-dquot_initialize_needed-when-debugging.patch