Commit e8baa63f authored Apr 25, 2024 by Jakub Kicinski

Merge tag 'nf-24-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf

Pablo Neira Ayuso says:

====================
Netfilter/IPVS fixes for net

The following patchset contains two Netfilter/IPVS fixes for net:

Patch #1 fixes SCTP checksumming for IPVS with gso packets,
	 from Ismael Luceno.

Patch #2 honor dormant flag from netdev event path to fix a possible
	 double hook unregistration.

* tag 'nf-24-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: nf_tables: honor table dormant flag from netdev release event path
  ipvs: Fix checksumming on GSO of SCTP packets
====================

Link: https://lore.kernel.org/r/20240425090149.1359547-1-pablo@netfilter.org


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 1971d13f 8e30abc9

net/netfilter/ipvs/ip_vs_proto_sctp.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ sctp_snat_handler(struct sk_buff skb, struct ip_vs_protocol pp,
		if (sctph->source != cp->vport \|\| payload_csum \|\|
		skb->ip_summed == CHECKSUM_PARTIAL) {
		sctph->source = cp->vport;
		if (!skb_is_gso(skb) \|\| !skb_is_gso_sctp(skb))
		sctp_nat_csum(skb, sctph, sctphoff);
		} else {
		skb->ip_summed = CHECKSUM_UNNECESSARY;
		@@ -174,6 +175,7 @@ sctp_dnat_handler(struct sk_buff skb, struct ip_vs_protocol pp,
		(skb->ip_summed == CHECKSUM_PARTIAL &&
		!(skb_dst(skb)->dev->features & NETIF_F_SCTP_CRC))) {
		sctph->dest = cp->dport;
		if (!skb_is_gso(skb) \|\| !skb_is_gso_sctp(skb))
		sctp_nat_csum(skb, sctph, sctphoff);
		} else if (skb->ip_summed != CHECKSUM_PARTIAL) {
		skb->ip_summed = CHECKSUM_UNNECESSARY;

net/netfilter/nft_chain_filter.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,9 @@ static void nft_netdev_event(unsigned long event, struct net_device *dev,
		return;

		if (n > 1) {
		if (!(ctx->chain->table->flags & NFT_TABLE_F_DORMANT))
		nf_unregister_net_hook(ctx->net, &found->ops);

		list_del_rcu(&found->list);
		kfree_rcu(found, rcu);
		return;