Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36f098e1 authored by Florian Westphal's avatar Florian Westphal Committed by Greg Kroah-Hartman
Browse files

netfilter: br_netfilter: fix recent physdev match breakage 



[ Upstream commit 94623f579ce338b5fa61b5acaa5beb8aa657fb9e ]

Recent attempt to ensure PREROUTING hook is executed again when a
decrypted ipsec packet received on a bridge passes through the network
stack a second time broke the physdev match in INPUT hook.

We can't discard the nf_bridge info strct from sabotage_in hook, as
this is needed by the physdev match.

Keep the struct around and handle this with another conditional instead.

Fixes: 2b272bb558f1 ("netfilter: br_netfilter: disable sabotage_in hook after first suppression")
Reported-and-tested-by: default avatarFarid BENAMROUCHE <fariouche@yahoo.fr>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 375e445b

include/linux/skbuff.h

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ struct nf_bridge_info { 
	u8			pkt_otherhost:1;

	u8			in_prerouting:1;

	u8			bridged_dnat:1;

	u8			sabotage_in_done:1;

	__u16			frag_max_size;

	struct net_device	*physindev;

net/bridge/br_netfilter_hooks.c

+11 −6
Original line number Diff line number Diff line
@@ -868,13 +868,18 @@ static unsigned int ip_sabotage_in(void *priv, 
{

	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);



	if (nf_bridge && !nf_bridge->in_prerouting &&

	if (nf_bridge) {

		if (nf_bridge->sabotage_in_done)

			return NF_ACCEPT;



		if (!nf_bridge->in_prerouting &&

		    !netif_is_l3_master(skb->dev) &&

		    !netif_is_l3_slave(skb->dev)) {

		nf_bridge_info_free(skb);

			nf_bridge->sabotage_in_done = 1;

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

			return NF_STOLEN;

		}

	}



	return NF_ACCEPT;

}