From: Greg Kroah-Hartman Date: Mon, 12 Jun 2023 08:42:28 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.14.318~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64b0bbbf0d7c6b2542e71fb46b7e5a1e57730242;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: ext4-only-check-dquot_initialize_needed-when-debugging.patch --- diff --git a/queue-4.14/ext4-only-check-dquot_initialize_needed-when-debugging.patch b/queue-4.14/ext4-only-check-dquot_initialize_needed-when-debugging.patch new file mode 100644 index 00000000000..149188f4892 --- /dev/null +++ b/queue-4.14/ext4-only-check-dquot_initialize_needed-when-debugging.patch @@ -0,0 +1,47 @@ +From dea9d8f7643fab07bf89a1155f1f94f37d096a5e Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Thu, 8 Jun 2023 10:06:40 -0400 +Subject: ext4: only check dquot_initialize_needed() when debugging + +From: Theodore Ts'o + +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 +Signed-off-by: Greg Kroah-Hartman +--- + fs/ext4/xattr.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/fs/ext4/xattr.c ++++ b/fs/ext4/xattr.c +@@ -2021,8 +2021,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, +@@ -2090,8 +2091,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, diff --git a/queue-4.14/series b/queue-4.14/series index b5640f05c12..f34228d7def 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -15,3 +15,4 @@ drm-amdgpu-fix-xclk-freq-on-chip_stoney.patch 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 i2c-sprd-delete-i2c-adapter-in-.remove-s-error-path.patch +ext4-only-check-dquot_initialize_needed-when-debugging.patch