Netfilter/IPVS fixes for net
Subsystems (4)
Pablo Neira Ayuso
maintainercover Netfilter/IPVS fixes for net
Hi David,
The following patchset contains Netfilter/IPVS fixes for net:
1) Follow up patch to fix a compilation warning in a recent IPVS fix:
098e13f5b21d ("ipvs: fix dependency on nf_defrag_ipv6").
2) Bogus ENOENT error on flush after rule deletion in the same batch, reported by Phil Sutter.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Thanks!
----------------------------------------------------------------
The following changes since commit f9bcc9f3ee4fbbe8f11dfec76745476f5780517e:
net: ethernet: freescale: set FEC ethtool regs version (2019-02-14 12:45:35 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD
for you to fetch changes up to c93a49b9769e435990c82297aa0baa31e1538790:
ipvs: fix warning on unused variable (2019-02-16 10:41:42 +0100)
----------------------------------------------------------------
Andrea Claudi (1):
ipvs: fix warning on unused variable
Pablo Neira Ayuso (1):
netfilter: nf_tables: fix flush after rule deletion in the same batch
net/netfilter/ipvs/ip_vs_ctl.c | 3 ++- net/netfilter/nf_tables_api.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: nf_tables: fix flush after rule deletion in the same batch
Flush after rule deletion bogusly hits -ENOENT. Skip rules that have been already from nft_delrule_by_chain() which is always called from the flush path.
--- net/netfilter/nf_tables_api.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nf_tables_api.c +3 -0
@@ -313,6 +313,9 @@ static int nft_delrule_by_chain(struct nft_ctx *ctx)int err;list_for_each_entry (rule, &ctx->chain->rules, list) { +if (!nft_is_active_next (ctx->net, rule)) +continue ; + err =nft_delrule (ctx, rule);if (err <0 )return err;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/2 ipvs: fix warning on unused variable
In reply to Pablo Neira AyusoFrom: Andrea Claudi <[email protected]>
When CONFIG_IP_VS_IPV6 is not defined, build produced this warning:
net/netfilter/ipvs/ip_vs_ctl.c:899:6: warning: unused variable ‘ret’ [-Wunused-variable]
int ret = 0;
^~~Fix this by moving the declaration of 'ret' in the CONFIG_IP_VS_IPV6 section in the same function.
While at it, drop its unneeded initialisation.
--- net/netfilter/ipvs/ip_vs_ctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/ipvs/ip_vs_ctl.c +2 -1
@@ -896,12 +896,13 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest, { struct ip_vs_dest *dest; unsigned int atype, i; - int ret = 0; EnterFunction(2); #ifdef CONFIG_IP_VS_IPV6 if (udest->af == AF_INET6) { + int ret; + atype = ipv6_addr_type(&udest->addr.in6); if ((!(atype & IPV6_ADDR_UNICAST) || atype & IPV6_ADDR_LINKLOCAL) &&
Signature · 1 line
2.11.0
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Tue, 19 Feb 2019 00:08:21 +0100
Quoted 11 lines
The following patchset contains Netfilter/IPVS fixes for net:
1) Follow up patch to fix a compilation warning in a recent IPVS fix:
098e13f5b21d ("ipvs: fix dependency on nf_defrag_ipv6").2) Bogus ENOENT error on flush after rule deletion in the same batch, reported by Phil Sutter.
You can pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
Series applied, thanks.