drop queue-5.4/ext4-avoid-ptr-null-pointer-dereference.patch

Accidentally applied it to the wrong branch

diff --git a/queue-5.4/ext4-avoid-ptr-null-pointer-dereference.patch b/queue-5.4/ext4-avoid-ptr-null-pointer-dereference.patch
deleted file mode 100644 (file)
index 350b56a..0000000
--- a/queue-5.4/ext4-avoid-ptr-null-pointer-dereference.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From libaokun@huaweicloud.com  Tue Jul 16 15:13:28 2024
-From: libaokun@huaweicloud.com
-Date: Tue, 16 Jul 2024 17:29:29 +0800
-Subject: ext4: avoid ptr null pointer dereference
-To: stable@vger.kernel.org, gregkh@linuxfoundation.org
-Cc: sashal@kernel.org, tytso@mit.edu, jack@suse.cz, patches@lists.linux.dev, yi.zhang@huawei.com, yangerkun@huawei.com, libaokun@huaweicloud.com, Baokun Li <libaokun1@huawei.com>
-Message-ID: <20240716092929.864207-1-libaokun@huaweicloud.com>
-
-From: Baokun Li <libaokun1@huawei.com>
-
-When commit 13df4d44a3aa ("ext4: fix slab-out-of-bounds in
-ext4_mb_find_good_group_avg_frag_lists()") was backported to stable, the
-commit f536808adcc3 ("ext4: refactor out ext4_generic_attr_store()") that
-uniformly determines if the ptr is null is not merged in, so it needs to
-be judged whether ptr is null or not in each case of the switch, otherwise
-null pointer dereferencing may occur.
-
-Signed-off-by: Baokun Li <libaokun1@huawei.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/sysfs.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c
-index 63cbda3700ea..d65dccb44ed5 100644
---- a/fs/ext4/sysfs.c
-+++ b/fs/ext4/sysfs.c
-@@ -473,6 +473,8 @@ static ssize_t ext4_attr_store(struct kobject *kobj,
-                       *((unsigned int *) ptr) = t;
-               return len;
-       case attr_clusters_in_group:
-+              if (!ptr)
-+                      return 0;
-               ret = kstrtouint(skip_spaces(buf), 0, &t);
-               if (ret)
-                       return ret;
--- 
-2.39.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 0b63c5321b906cbc1a36c5d82db71bb30f7ff7bb..b92d491ad747a452f16a45a09857145c01cecce0 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -75,5 +75,4 @@ net-tcp-fix-unexcepted-socket-die-when-snd_wnd-is-0.patch
 tcp-use-signed-arithmetic-in-tcp_rtx_probe0_timed_out.patch
 tcp-avoid-too-many-retransmit-packets.patch
 nilfs2-fix-kernel-bug-on-rename-operation-of-broken-directory.patch
-ext4-avoid-ptr-null-pointer-dereference.patch
 i2c-rcar-bring-hardware-to-known-state-when-probing.patch