From 31fefff9fa487dc06c9a871f8b5eddd8fd7169d0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 10 Jul 2022 16:27:50 +0200 Subject: [PATCH] 4.9-stable patches added patches: xfs-remove-incorrect-assert-in-xfs_rename.patch --- queue-4.9/series | 1 + ...emove-incorrect-assert-in-xfs_rename.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 queue-4.9/xfs-remove-incorrect-assert-in-xfs_rename.patch diff --git a/queue-4.9/series b/queue-4.9/series index cfb96507a93..930fa81e957 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -5,3 +5,4 @@ usbnet-fix-memory-leak-in-error-case.patch net-rose-fix-uaf-bug-caused-by-rose_t0timer_expiry.patch iommu-vt-d-fix-pci-bus-rescan-device-hot-add.patch video-of_display_timing.h-include-errno.h.patch +xfs-remove-incorrect-assert-in-xfs_rename.patch diff --git a/queue-4.9/xfs-remove-incorrect-assert-in-xfs_rename.patch b/queue-4.9/xfs-remove-incorrect-assert-in-xfs_rename.patch new file mode 100644 index 00000000000..4a2b51849c9 --- /dev/null +++ b/queue-4.9/xfs-remove-incorrect-assert-in-xfs_rename.patch @@ -0,0 +1,40 @@ +From kuniyu@amazon.com Sun Jul 10 16:25:33 2022 +From: Kuniyuki Iwashima +Date: Thu, 7 Jul 2022 16:07:53 -0700 +Subject: xfs: remove incorrect ASSERT in xfs_rename +To: , +Cc: Kuniyuki Iwashima , Ke Xu , "Ayushman Dutta" , Eric Sandeen , Paolo Bonzini , "Darrick J . Wong" +Message-ID: <20220707230753.32743-1-kuniyu@amazon.com> + +From: Eric Sandeen + +commit e445976537ad139162980bee015b7364e5b64fff upstream. + +This ASSERT in xfs_rename is a) incorrect, because +(RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and +b) unnecessary, because actual invalid flag combinations are already +handled at the vfs level in do_renameat2() before we get called. +So, remove it. + +Reported-by: Paolo Bonzini +Signed-off-by: Eric Sandeen +Reviewed-by: Darrick J. Wong +Signed-off-by: Darrick J. Wong +Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support") +Signed-off-by: Kuniyuki Iwashima +Acked-by: Darrick J. Wong +Signed-off-by: Greg Kroah-Hartman +--- + fs/xfs/xfs_inode.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/fs/xfs/xfs_inode.c ++++ b/fs/xfs/xfs_inode.c +@@ -2973,7 +2973,6 @@ xfs_rename( + * appropriately. + */ + if (flags & RENAME_WHITEOUT) { +- ASSERT(!(flags & (RENAME_NOREPLACE | RENAME_EXCHANGE))); + error = xfs_rename_alloc_whiteout(target_dp, &wip); + if (error) + return error; -- 2.47.3