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

Commit 8d045163 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: bridge: kill nf_bridge_pad 



The br_netfilter frag output function calls skb_cow_head() so in
case it needs a larger headroom to e.g. re-add a previously stripped PPPOE
or VLAN header things will still work (at cost of reallocation).

We can then move nf_bridge_encap_header_len to br_netfilter.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ffdb210e

include/linux/netfilter_bridge.h

+0 −22
Original line number Original line Diff line number Diff line
@@ -23,18 +23,6 @@ enum nf_br_hook_priorities { 
#define BRNF_8021Q			0x10

#define BRNF_8021Q			0x10

#define BRNF_PPPoE			0x20

#define BRNF_PPPoE			0x20





static inline unsigned int nf_bridge_encap_header_len(const struct sk_buff *skb)

{

	switch (skb->protocol) {

	case __cpu_to_be16(ETH_P_8021Q):

		return VLAN_HLEN;

	case __cpu_to_be16(ETH_P_PPP_SES):

		return PPPOE_SES_HLEN;

	default:

		return 0;

	}

}



static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)

static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb)

{

{

	if (unlikely(skb->nf_bridge->mask & BRNF_PPPoE))

	if (unlikely(skb->nf_bridge->mask & BRNF_PPPoE))
@@ -44,15 +32,6 @@ static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb) 




int br_handle_frame_finish(struct sk_buff *skb);

int br_handle_frame_finish(struct sk_buff *skb);





/* This is called by the IP fragmenting code and it ensures there is

 * enough room for the encapsulating header (if there is one). */

static inline unsigned int nf_bridge_pad(const struct sk_buff *skb)

{

	if (skb->nf_bridge)

		return nf_bridge_encap_header_len(skb);

	return 0;

}



static inline void br_drop_fake_rtable(struct sk_buff *skb)

static inline void br_drop_fake_rtable(struct sk_buff *skb)

{

{

	struct dst_entry *dst = skb_dst(skb);

	struct dst_entry *dst = skb_dst(skb);
@@ -62,7 +41,6 @@ static inline void br_drop_fake_rtable(struct sk_buff *skb) 
}

}





#else

#else

#define nf_bridge_pad(skb)			(0)

#define br_drop_fake_rtable(skb)	        do { } while (0)

#define br_drop_fake_rtable(skb)	        do { } while (0)

#endif /* CONFIG_BRIDGE_NETFILTER */

#endif /* CONFIG_BRIDGE_NETFILTER */

net/bridge/br_netfilter.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -153,6 +153,18 @@ static inline struct nf_bridge_info *nf_bridge_unshare(struct sk_buff *skb) 
	return nf_bridge;

	return nf_bridge;

}

}





static unsigned int nf_bridge_encap_header_len(const struct sk_buff *skb)

{

	switch (skb->protocol) {

	case __cpu_to_be16(ETH_P_8021Q):

		return VLAN_HLEN;

	case __cpu_to_be16(ETH_P_PPP_SES):

		return PPPOE_SES_HLEN;

	default:

		return 0;

	}

}



static inline void nf_bridge_push_encap_header(struct sk_buff *skb)

static inline void nf_bridge_push_encap_header(struct sk_buff *skb)

{

{

	unsigned int len = nf_bridge_encap_header_len(skb);

	unsigned int len = nf_bridge_encap_header_len(skb);

net/ipv4/ip_output.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -636,10 +636,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) 
	left = skb->len - hlen;		/* Space per frame */

	left = skb->len - hlen;		/* Space per frame */

	ptr = hlen;		/* Where to start from */

	ptr = hlen;		/* Where to start from */





	/* for bridged IP traffic encapsulated inside f.e. a vlan header,

	ll_rs = LL_RESERVED_SPACE(rt->dst.dev);

	 * we need to make room for the encapsulating header

	 */

	ll_rs = LL_RESERVED_SPACE_EXTRA(rt->dst.dev, nf_bridge_pad(skb));





	/*

	/*

	 *	Fragment the datagram.

	 *	Fragment the datagram.