From: Greg Kroah-Hartman Date: Mon, 24 Jun 2024 15:01:31 +0000 (+0200) Subject: 6.9-stable patches X-Git-Tag: v6.1.96~45 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddfd4b1508defe163c2b816fceb01497bc862268;p=thirdparty%2Fkernel%2Fstable-queue.git 6.9-stable patches added patches: ext4-avoid-overflow-when-setting-values-via-sysfs.patch ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch --- diff --git a/queue-6.9/ext4-avoid-overflow-when-setting-values-via-sysfs.patch b/queue-6.9/ext4-avoid-overflow-when-setting-values-via-sysfs.patch new file mode 100644 index 00000000000..152fc4a828d --- /dev/null +++ b/queue-6.9/ext4-avoid-overflow-when-setting-values-via-sysfs.patch @@ -0,0 +1,74 @@ +From 9e8e819f8f272c4e5dcd0bd6c7450e36481ed139 Mon Sep 17 00:00:00 2001 +From: Baokun Li +Date: Tue, 19 Mar 2024 19:33:17 +0800 +Subject: ext4: avoid overflow when setting values via sysfs + +From: Baokun Li + +commit 9e8e819f8f272c4e5dcd0bd6c7450e36481ed139 upstream. + +When setting values of type unsigned int through sysfs, we use kstrtoul() +to parse it and then truncate part of it as the final set value, when the +set value is greater than UINT_MAX, the set value will not match what we +see because of the truncation. As follows: + + $ echo 4294967296 > /sys/fs/ext4/sda/mb_max_linear_groups + $ cat /sys/fs/ext4/sda/mb_max_linear_groups + 0 + +So we use kstrtouint() to parse the attr_pointer_ui type to avoid the +inconsistency described above. In addition, a judgment is added to avoid +setting s_resv_clusters less than 0. + +Signed-off-by: Baokun Li +Reviewed-by: Jan Kara +Link: https://lore.kernel.org/r/20240319113325.3110393-2-libaokun1@huawei.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Greg Kroah-Hartman +--- + fs/ext4/sysfs.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +--- a/fs/ext4/sysfs.c ++++ b/fs/ext4/sysfs.c +@@ -104,7 +104,7 @@ static ssize_t reserved_clusters_store(s + int ret; + + ret = kstrtoull(skip_spaces(buf), 0, &val); +- if (ret || val >= clusters) ++ if (ret || val >= clusters || (s64)val < 0) + return -EINVAL; + + atomic64_set(&sbi->s_resv_clusters, val); +@@ -451,7 +451,8 @@ static ssize_t ext4_attr_store(struct ko + s_kobj); + struct ext4_attr *a = container_of(attr, struct ext4_attr, attr); + void *ptr = calc_ptr(a, sbi); +- unsigned long t; ++ unsigned int t; ++ unsigned long lt; + int ret; + + switch (a->attr_id) { +@@ -460,7 +461,7 @@ static ssize_t ext4_attr_store(struct ko + case attr_pointer_ui: + if (!ptr) + return 0; +- ret = kstrtoul(skip_spaces(buf), 0, &t); ++ ret = kstrtouint(skip_spaces(buf), 0, &t); + if (ret) + return ret; + if (a->attr_ptr == ptr_ext4_super_block_offset) +@@ -471,10 +472,10 @@ static ssize_t ext4_attr_store(struct ko + case attr_pointer_ul: + if (!ptr) + return 0; +- ret = kstrtoul(skip_spaces(buf), 0, &t); ++ ret = kstrtoul(skip_spaces(buf), 0, <); + if (ret) + return ret; +- *((unsigned long *) ptr) = t; ++ *((unsigned long *) ptr) = lt; + return len; + case attr_inode_readahead: + return inode_readahead_blks_store(sbi, buf, len); diff --git a/queue-6.9/ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch b/queue-6.9/ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch new file mode 100644 index 00000000000..3bb8c9c94a4 --- /dev/null +++ b/queue-6.9/ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch @@ -0,0 +1,140 @@ +From 13df4d44a3aaabe61cd01d277b6ee23ead2a5206 Mon Sep 17 00:00:00 2001 +From: Baokun Li +Date: Tue, 19 Mar 2024 19:33:20 +0800 +Subject: ext4: fix slab-out-of-bounds in ext4_mb_find_good_group_avg_frag_lists() + +From: Baokun Li + +commit 13df4d44a3aaabe61cd01d277b6ee23ead2a5206 upstream. + +We can trigger a slab-out-of-bounds with the following commands: + + mkfs.ext4 -F /dev/$disk 10G + mount /dev/$disk /tmp/test + echo 2147483647 > /sys/fs/ext4/$disk/mb_group_prealloc + echo test > /tmp/test/file && sync + +================================================================== +BUG: KASAN: slab-out-of-bounds in ext4_mb_find_good_group_avg_frag_lists+0x8a/0x200 [ext4] +Read of size 8 at addr ffff888121b9d0f0 by task kworker/u2:0/11 +CPU: 0 PID: 11 Comm: kworker/u2:0 Tainted: GL 6.7.0-next-20240118 #521 +Call Trace: + dump_stack_lvl+0x2c/0x50 + kasan_report+0xb6/0xf0 + ext4_mb_find_good_group_avg_frag_lists+0x8a/0x200 [ext4] + ext4_mb_regular_allocator+0x19e9/0x2370 [ext4] + ext4_mb_new_blocks+0x88a/0x1370 [ext4] + ext4_ext_map_blocks+0x14f7/0x2390 [ext4] + ext4_map_blocks+0x569/0xea0 [ext4] + ext4_do_writepages+0x10f6/0x1bc0 [ext4] +[...] +================================================================== + +The flow of issue triggering is as follows: + +// Set s_mb_group_prealloc to 2147483647 via sysfs +ext4_mb_new_blocks + ext4_mb_normalize_request + ext4_mb_normalize_group_request + ac->ac_g_ex.fe_len = EXT4_SB(sb)->s_mb_group_prealloc + ext4_mb_regular_allocator + ext4_mb_choose_next_group + ext4_mb_choose_next_group_best_avail + mb_avg_fragment_size_order + order = fls(len) - 2 = 29 + ext4_mb_find_good_group_avg_frag_lists + frag_list = &sbi->s_mb_avg_fragment_size[order] + if (list_empty(frag_list)) // Trigger SOOB! + +At 4k block size, the length of the s_mb_avg_fragment_size list is 14, +but an oversized s_mb_group_prealloc is set, causing slab-out-of-bounds +to be triggered by an attempt to access an element at index 29. + +Add a new attr_id attr_clusters_in_group with values in the range +[0, sbi->s_clusters_per_group] and declare mb_group_prealloc as +that type to fix the issue. In addition avoid returning an order +from mb_avg_fragment_size_order() greater than MB_NUM_ORDERS(sb) +and reduce some useless loops. + +Fixes: 7e170922f06b ("ext4: Add allocation criteria 1.5 (CR1_5)") +CC: stable@vger.kernel.org +Signed-off-by: Baokun Li +Reviewed-by: Jan Kara +Reviewed-by: Ojaswin Mujoo +Link: https://lore.kernel.org/r/20240319113325.3110393-5-libaokun1@huawei.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Greg Kroah-Hartman +--- + fs/ext4/mballoc.c | 4 ++++ + fs/ext4/sysfs.c | 13 ++++++++++++- + 2 files changed, 16 insertions(+), 1 deletion(-) + +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -831,6 +831,8 @@ static int mb_avg_fragment_size_order(st + return 0; + if (order == MB_NUM_ORDERS(sb)) + order--; ++ if (WARN_ON_ONCE(order > MB_NUM_ORDERS(sb))) ++ order = MB_NUM_ORDERS(sb) - 1; + return order; + } + +@@ -1008,6 +1010,8 @@ static void ext4_mb_choose_next_group_be + * goal length. + */ + order = fls(ac->ac_g_ex.fe_len) - 1; ++ if (WARN_ON_ONCE(order - 1 > MB_NUM_ORDERS(ac->ac_sb))) ++ order = MB_NUM_ORDERS(ac->ac_sb); + min_order = order - sbi->s_mb_best_avail_max_trim_order; + if (min_order < 0) + min_order = 0; +--- a/fs/ext4/sysfs.c ++++ b/fs/ext4/sysfs.c +@@ -29,6 +29,7 @@ typedef enum { + attr_trigger_test_error, + attr_first_error_time, + attr_last_error_time, ++ attr_clusters_in_group, + attr_feature, + attr_pointer_ui, + attr_pointer_ul, +@@ -207,13 +208,14 @@ EXT4_ATTR_FUNC(sra_exceeded_retry_limit, + + EXT4_ATTR_OFFSET(inode_readahead_blks, 0644, inode_readahead, + ext4_sb_info, s_inode_readahead_blks); ++EXT4_ATTR_OFFSET(mb_group_prealloc, 0644, clusters_in_group, ++ ext4_sb_info, s_mb_group_prealloc); + EXT4_RW_ATTR_SBI_UI(inode_goal, s_inode_goal); + EXT4_RW_ATTR_SBI_UI(mb_stats, s_mb_stats); + EXT4_RW_ATTR_SBI_UI(mb_max_to_scan, s_mb_max_to_scan); + EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan); + EXT4_RW_ATTR_SBI_UI(mb_order2_req, s_mb_order2_reqs); + EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream_request); +-EXT4_RW_ATTR_SBI_UI(mb_group_prealloc, s_mb_group_prealloc); + EXT4_RW_ATTR_SBI_UI(mb_max_linear_groups, s_mb_max_linear_groups); + EXT4_RW_ATTR_SBI_UI(extent_max_zeroout_kb, s_extent_max_zeroout_kb); + EXT4_ATTR(trigger_fs_error, 0200, trigger_test_error); +@@ -392,6 +394,7 @@ static ssize_t ext4_attr_show(struct kob + (unsigned long long) + percpu_counter_sum(&sbi->s_sra_exceeded_retry_limit)); + case attr_inode_readahead: ++ case attr_clusters_in_group: + case attr_pointer_ui: + if (!ptr) + return 0; +@@ -469,6 +472,14 @@ static ssize_t ext4_attr_store(struct ko + else + *((unsigned int *) ptr) = t; + return len; ++ case attr_clusters_in_group: ++ ret = kstrtouint(skip_spaces(buf), 0, &t); ++ if (ret) ++ return ret; ++ if (t > sbi->s_clusters_per_group) ++ return -EINVAL; ++ *((unsigned int *) ptr) = t; ++ return len; + case attr_pointer_ul: + if (!ptr) + return 0; diff --git a/queue-6.9/netfilter-move-the-sysctl-nf_hooks_lwtunnel-into-the.patch b/queue-6.9/netfilter-move-the-sysctl-nf_hooks_lwtunnel-into-the.patch index c5c02df147f..7940f015d46 100644 --- a/queue-6.9/netfilter-move-the-sysctl-nf_hooks_lwtunnel-into-the.patch +++ b/queue-6.9/netfilter-move-the-sysctl-nf_hooks_lwtunnel-into-the.patch @@ -19,15 +19,13 @@ Signed-off-by: Jianguo Wu Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- - include/net/netns/netfilter.h | 3 ++ - net/netfilter/core.c | 13 ++++- - net/netfilter/nf_conntrack_standalone.c | 15 ------ - net/netfilter/nf_hooks_lwtunnel.c | 67 +++++++++++++++++++++++++ - net/netfilter/nf_internals.h | 6 +++ + include/net/netns/netfilter.h | 3 + + net/netfilter/core.c | 13 +++++- + net/netfilter/nf_conntrack_standalone.c | 15 ------- + net/netfilter/nf_hooks_lwtunnel.c | 67 ++++++++++++++++++++++++++++++++ + net/netfilter/nf_internals.h | 6 ++ 5 files changed, 87 insertions(+), 17 deletions(-) -diff --git a/include/net/netns/netfilter.h b/include/net/netns/netfilter.h -index 02bbdc577f8e2..a6a0bf4a247e5 100644 --- a/include/net/netns/netfilter.h +++ b/include/net/netns/netfilter.h @@ -15,6 +15,9 @@ struct netns_nf { @@ -40,8 +38,6 @@ index 02bbdc577f8e2..a6a0bf4a247e5 100644 #endif struct nf_hook_entries __rcu *hooks_ipv4[NF_INET_NUMHOOKS]; struct nf_hook_entries __rcu *hooks_ipv6[NF_INET_NUMHOOKS]; -diff --git a/net/netfilter/core.c b/net/netfilter/core.c -index 3126911f50425..b00fc285b3349 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -815,12 +815,21 @@ int __init netfilter_init(void) @@ -68,8 +64,6 @@ index 3126911f50425..b00fc285b3349 100644 unregister_pernet_subsys(&netfilter_net_ops); err: return ret; -diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c -index 2f226cfb32d04..f713df823daaf 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -22,9 +22,6 @@ @@ -90,9 +84,9 @@ index 2f226cfb32d04..f713df823daaf 100644 - NF_SYSCTL_CT_LWTUNNEL, -#endif - NF_SYSCTL_CT_LAST_SYSCTL, + __NF_SYSCTL_CT_LAST_SYSCTL, }; -@@ -946,15 +940,6 @@ static struct ctl_table nf_ct_sysctl_table[] = { +@@ -948,15 +942,6 @@ static struct ctl_table nf_ct_sysctl_tab .proc_handler = proc_dointvec_jiffies, }, #endif @@ -105,11 +99,9 @@ index 2f226cfb32d04..f713df823daaf 100644 - .proc_handler = nf_hooks_lwtunnel_sysctl_handler, - }, -#endif + {} }; - static struct ctl_table nf_ct_netfilter_table[] = { -diff --git a/net/netfilter/nf_hooks_lwtunnel.c b/net/netfilter/nf_hooks_lwtunnel.c -index 00e89ffd78f69..7cdb59bb4459f 100644 --- a/net/netfilter/nf_hooks_lwtunnel.c +++ b/net/netfilter/nf_hooks_lwtunnel.c @@ -3,6 +3,9 @@ @@ -122,7 +114,7 @@ index 00e89ffd78f69..7cdb59bb4459f 100644 static inline int nf_hooks_lwtunnel_get(void) { -@@ -50,4 +53,68 @@ int nf_hooks_lwtunnel_sysctl_handler(struct ctl_table *table, int write, +@@ -50,4 +53,68 @@ int nf_hooks_lwtunnel_sysctl_handler(str return ret; } EXPORT_SYMBOL_GPL(nf_hooks_lwtunnel_sysctl_handler); @@ -191,11 +183,9 @@ index 00e89ffd78f69..7cdb59bb4459f 100644 + unregister_pernet_subsys(&nf_lwtunnel_net_ops); +} #endif /* CONFIG_SYSCTL */ -diff --git a/net/netfilter/nf_internals.h b/net/netfilter/nf_internals.h -index 832ae64179f0f..25403023060b6 100644 --- a/net/netfilter/nf_internals.h +++ b/net/netfilter/nf_internals.h -@@ -29,6 +29,12 @@ void nf_queue_nf_hook_drop(struct net *net); +@@ -29,6 +29,12 @@ void nf_queue_nf_hook_drop(struct net *n /* nf_log.c */ int __init netfilter_log_init(void); @@ -208,6 +198,3 @@ index 832ae64179f0f..25403023060b6 100644 /* core.c */ void nf_hook_entries_delete_raw(struct nf_hook_entries __rcu **pp, const struct nf_hook_ops *reg); --- -2.43.0 - diff --git a/queue-6.9/netfilter-remove-the-now-superfluous-sentinel-elemen.patch b/queue-6.9/netfilter-remove-the-now-superfluous-sentinel-elemen.patch deleted file mode 100644 index 1f09afd8e6f..00000000000 --- a/queue-6.9/netfilter-remove-the-now-superfluous-sentinel-elemen.patch +++ /dev/null @@ -1,193 +0,0 @@ -From abb965a84121050216b70ecc618f16f2bd3fa027 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 1 May 2024 11:29:30 +0200 -Subject: netfilter: Remove the now superfluous sentinel elements from - ctl_table array - -From: Joel Granados - -[ Upstream commit 635470eb0aa71ba41c47593c66f65ac1e5d59dd7 ] - -This commit comes at the tail end of a greater effort to remove the -empty elements at the end of the ctl_table arrays (sentinels) which will -reduce the overall build time size of the kernel and run time memory -bloat by ~64 bytes per sentinel (further information Link : -https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@bombadil.infradead.org/) - -* Remove sentinel elements from ctl_table structs -* Remove instances where an array element is zeroed out to make it look - like a sentinel. This is not longer needed and is safe after commit - c899710fe7f9 ("networking: Update to register_net_sysctl_sz") added - the array size to the ctl_table registration -* Remove the need for having __NF_SYSCTL_CT_LAST_SYSCTL as the - sysctl array size is now in NF_SYSCTL_CT_LAST_SYSCTL -* Remove extra element in ctl_table arrays declarations - -Acked-by: Kees Cook # loadpin & yama -Signed-off-by: Joel Granados -Signed-off-by: David S. Miller -Stable-dep-of: a2225e0250c5 ("netfilter: move the sysctl nf_hooks_lwtunnel into the netfilter core") -Signed-off-by: Sasha Levin ---- - net/bridge/br_netfilter_hooks.c | 1 - - net/ipv6/netfilter/nf_conntrack_reasm.c | 1 - - net/netfilter/ipvs/ip_vs_ctl.c | 5 +---- - net/netfilter/ipvs/ip_vs_lblc.c | 5 +---- - net/netfilter/ipvs/ip_vs_lblcr.c | 5 +---- - net/netfilter/nf_conntrack_standalone.c | 6 +----- - net/netfilter/nf_log.c | 3 +-- - 7 files changed, 5 insertions(+), 21 deletions(-) - -diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c -index 22e35623c148a..7c9ea1e4a829c 100644 ---- a/net/bridge/br_netfilter_hooks.c -+++ b/net/bridge/br_netfilter_hooks.c -@@ -1225,7 +1225,6 @@ static struct ctl_table brnf_table[] = { - .mode = 0644, - .proc_handler = brnf_sysctl_call_tables, - }, -- { } - }; - - static inline void br_netfilter_sysctl_default(struct brnf_net *brnf) -diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c -index d0dcbaca19943..abf6e24ae4ecf 100644 ---- a/net/ipv6/netfilter/nf_conntrack_reasm.c -+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c -@@ -62,7 +62,6 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = { - .mode = 0644, - .proc_handler = proc_doulongvec_minmax, - }, -- { } - }; - - static int nf_ct_frag6_sysctl_register(struct net *net) -diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c -index 143a341bbc0a4..50b5dbe40eb85 100644 ---- a/net/netfilter/ipvs/ip_vs_ctl.c -+++ b/net/netfilter/ipvs/ip_vs_ctl.c -@@ -2263,7 +2263,6 @@ static struct ctl_table vs_vars[] = { - .proc_handler = proc_dointvec, - }, - #endif -- { } - }; - - #endif -@@ -4286,10 +4285,8 @@ static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs) - return -ENOMEM; - - /* Don't export sysctls to unprivileged users */ -- if (net->user_ns != &init_user_ns) { -- tbl[0].procname = NULL; -+ if (net->user_ns != &init_user_ns) - ctl_table_size = 0; -- } - } else - tbl = vs_vars; - /* Initialize sysctl defaults */ -diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c -index 8ceec7a2fa8f3..2423513d701d4 100644 ---- a/net/netfilter/ipvs/ip_vs_lblc.c -+++ b/net/netfilter/ipvs/ip_vs_lblc.c -@@ -123,7 +123,6 @@ static struct ctl_table vs_vars_table[] = { - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, - }, -- { } - }; - #endif - -@@ -563,10 +562,8 @@ static int __net_init __ip_vs_lblc_init(struct net *net) - return -ENOMEM; - - /* Don't export sysctls to unprivileged users */ -- if (net->user_ns != &init_user_ns) { -- ipvs->lblc_ctl_table[0].procname = NULL; -+ if (net->user_ns != &init_user_ns) - vars_table_size = 0; -- } - - } else - ipvs->lblc_ctl_table = vs_vars_table; -diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c -index 0fb64707213f8..cdb1d4bf6761c 100644 ---- a/net/netfilter/ipvs/ip_vs_lblcr.c -+++ b/net/netfilter/ipvs/ip_vs_lblcr.c -@@ -294,7 +294,6 @@ static struct ctl_table vs_vars_table[] = { - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, - }, -- { } - }; - #endif - -@@ -749,10 +748,8 @@ static int __net_init __ip_vs_lblcr_init(struct net *net) - return -ENOMEM; - - /* Don't export sysctls to unprivileged users */ -- if (net->user_ns != &init_user_ns) { -- ipvs->lblcr_ctl_table[0].procname = NULL; -+ if (net->user_ns != &init_user_ns) - vars_table_size = 0; -- } - } else - ipvs->lblcr_ctl_table = vs_vars_table; - ipvs->sysctl_lblcr_expiration = DEFAULT_EXPIRATION; -diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c -index 0ee98ce5b8165..2f226cfb32d04 100644 ---- a/net/netfilter/nf_conntrack_standalone.c -+++ b/net/netfilter/nf_conntrack_standalone.c -@@ -616,11 +616,9 @@ enum nf_ct_sysctl_index { - NF_SYSCTL_CT_LWTUNNEL, - #endif - -- __NF_SYSCTL_CT_LAST_SYSCTL, -+ NF_SYSCTL_CT_LAST_SYSCTL, - }; - --#define NF_SYSCTL_CT_LAST_SYSCTL (__NF_SYSCTL_CT_LAST_SYSCTL + 1) -- - static struct ctl_table nf_ct_sysctl_table[] = { - [NF_SYSCTL_CT_MAX] = { - .procname = "nf_conntrack_max", -@@ -957,7 +955,6 @@ static struct ctl_table nf_ct_sysctl_table[] = { - .proc_handler = nf_hooks_lwtunnel_sysctl_handler, - }, - #endif -- {} - }; - - static struct ctl_table nf_ct_netfilter_table[] = { -@@ -968,7 +965,6 @@ static struct ctl_table nf_ct_netfilter_table[] = { - .mode = 0644, - .proc_handler = proc_dointvec, - }, -- { } - }; - - static void nf_conntrack_standalone_init_tcp_sysctl(struct net *net, -diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c -index 370f8231385ca..d42ba733496b2 100644 ---- a/net/netfilter/nf_log.c -+++ b/net/netfilter/nf_log.c -@@ -395,7 +395,7 @@ static const struct seq_operations nflog_seq_ops = { - - #ifdef CONFIG_SYSCTL - static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3]; --static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1]; -+static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO]; - static struct ctl_table_header *nf_log_sysctl_fhdr; - - static struct ctl_table nf_log_sysctl_ftable[] = { -@@ -406,7 +406,6 @@ static struct ctl_table nf_log_sysctl_ftable[] = { - .mode = 0644, - .proc_handler = proc_dointvec, - }, -- { } - }; - - static int nf_log_proc_dostring(struct ctl_table *table, int write, --- -2.43.0 - diff --git a/queue-6.9/series b/queue-6.9/series index 828d796560d..0b0ce356c80 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -135,7 +135,6 @@ octeontx2-pf-add-error-handling-to-vlan-unoffload-ha.patch octeontx2-pf-fix-linking-objects-into-multiple-modul.patch netfilter-ipset-fix-suspicious-rcu_dereference_prote.patch seg6-fix-parameter-passing-when-calling-nf_hook-in-e.patch -netfilter-remove-the-now-superfluous-sentinel-elemen.patch netfilter-move-the-sysctl-nf_hooks_lwtunnel-into-the.patch ice-fix-vsi-list-rule-with-ice_sw_lkup_last-type.patch bnxt_en-restore-ptp-tx_avail-count-in-case-of-skb_pa.patch @@ -178,3 +177,5 @@ rdma-mlx5-fix-unwind-flow-as-part-of-mlx5_ib_stage_i.patch rdma-mlx5-add-check-for-srq-max_sge-attribute.patch rdma-mana_ib-ignore-optional-access-flags-for-mrs.patch acpi-ec-evaluate-orphan-_reg-under-ec-device.patch +ext4-avoid-overflow-when-setting-values-via-sysfs.patch +ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch