Commit 64466c40 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf 

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

1) Release bridge info once packet escapes the br_netfilter path,
   from Florian Westphal.

2) Revert incorrect fix for the SCTP connection tracking chunk
   iterator, also from Florian.

First path fixes a long standing issue, the second path addresses
a mistake in the previous pull request for net.

* git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  Revert "netfilter: conntrack: fix bug in for_each_sctp_chunk"
  netfilter: br_netfilter: disable sabotage_in hook after first suppression
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents afc2336f bd0e06f0

net/bridge/br_netfilter_hooks.c

+1 −0
Original line number Diff line number Diff line
@@ -871,6 +871,7 @@ static unsigned int ip_sabotage_in(void *priv, 
	if (nf_bridge && !nf_bridge->in_prerouting &&

	    !netif_is_l3_master(skb->dev) &&

	    !netif_is_l3_slave(skb->dev)) {

		nf_bridge_info_free(skb);

		state->okfn(state->net, state->sk, skb);

		return NF_STOLEN;

	}

net/netfilter/nf_conntrack_proto_sctp.c

+3 −2
Original line number Diff line number Diff line
@@ -142,10 +142,11 @@ static void sctp_print_conntrack(struct seq_file *s, struct nf_conn *ct) 
}

#endif



/* do_basic_checks ensures sch->length > 0, do not use before */

#define for_each_sctp_chunk(skb, sch, _sch, offset, dataoff, count)	\

for ((offset) = (dataoff) + sizeof(struct sctphdr), (count) = 0;	\

	((sch) = skb_header_pointer((skb), (offset), sizeof(_sch), &(_sch))) &&	\

	(sch)->length;	\

	(offset) < (skb)->len &&					\

	((sch) = skb_header_pointer((skb), (offset), sizeof(_sch), &(_sch)));	\

	(offset) += (ntohs((sch)->length) + 3) & ~3, (count)++)



/* Some validity checks to make sure the chunks are fine */