From: Greg Kroah-Hartman Date: Mon, 24 Jun 2024 14:56:22 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v6.1.96~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e1bcfa7ed622151b39bb95fd7bdc112f5cbcb11;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: arm64-defconfig-enable-the-vf610-gpio-driver.patch --- diff --git a/queue-6.6/arm64-defconfig-enable-the-vf610-gpio-driver.patch b/queue-6.6/arm64-defconfig-enable-the-vf610-gpio-driver.patch new file mode 100644 index 00000000000..f7c775b5bde --- /dev/null +++ b/queue-6.6/arm64-defconfig-enable-the-vf610-gpio-driver.patch @@ -0,0 +1,33 @@ +From a73bda63a102a5f1feb730d4d809de098a3d1886 Mon Sep 17 00:00:00 2001 +From: Martin Kaiser +Date: Wed, 24 Jan 2024 21:59:00 +0100 +Subject: arm64: defconfig: enable the vf610 gpio driver + +From: Martin Kaiser + +commit a73bda63a102a5f1feb730d4d809de098a3d1886 upstream. + +The vf610 gpio driver is used in i.MX8QM, DXL, ULP and i.MX93 chips. +Enable it in arm64 defconfig. + +(vf610 gpio used to be enabled by default for all i.MX chips. This was +changed recently as most i.MX chips don't need this driver.) + +Signed-off-by: Martin Kaiser +Signed-off-by: Shawn Guo +Signed-off-by: Fabio Estevam +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/configs/defconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -623,6 +623,7 @@ CONFIG_GPIO_RCAR=y + CONFIG_GPIO_UNIPHIER=y + CONFIG_GPIO_VISCONTI=y + CONFIG_GPIO_WCD934X=m ++CONFIG_GPIO_VF610=y + CONFIG_GPIO_XGENE=y + CONFIG_GPIO_XGENE_SB=y + CONFIG_GPIO_MAX732X=y diff --git a/queue-6.6/netfilter-move-the-sysctl-nf_hooks_lwtunnel-into-the.patch b/queue-6.6/netfilter-move-the-sysctl-nf_hooks_lwtunnel-into-the.patch index 87528e17b70..b4739d4c104 100644 --- a/queue-6.6/netfilter-move-the-sysctl-nf_hooks_lwtunnel-into-the.patch +++ b/queue-6.6/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 ef4e76e5aef9f..7bae43b00ebbe 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 ef4e76e5aef9f..7bae43b00ebbe 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.6/netfilter-remove-the-now-superfluous-sentinel-elemen.patch b/queue-6.6/netfilter-remove-the-now-superfluous-sentinel-elemen.patch deleted file mode 100644 index 882100a0c0b..00000000000 --- a/queue-6.6/netfilter-remove-the-now-superfluous-sentinel-elemen.patch +++ /dev/null @@ -1,193 +0,0 @@ -From acebfc7a8b83df4199a3a8c7c5c109a844754f97 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 d848c84ed030d..9a875329d4193 100644 ---- a/net/bridge/br_netfilter_hooks.c -+++ b/net/bridge/br_netfilter_hooks.c -@@ -1229,7 +1229,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 efbec7ee27d0a..2379d8edbb175 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 cf78ba4ce5ffd..86c50234241fb 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 9eddf118b40ec..150849f1fb351 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 e16f158388bbe..0870a0e067a84 100644 ---- a/net/netfilter/nf_log.c -+++ b/net/netfilter/nf_log.c -@@ -390,7 +390,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[] = { -@@ -401,7 +401,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.6/series b/queue-6.6/series index 67b4a866b9c..5c1eb97b6e6 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -97,7 +97,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 @@ -133,3 +132,4 @@ 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 +arm64-defconfig-enable-the-vf610-gpio-driver.patch