The config NF_CONNTRACK_BRIDGE will change the way fragments are processed.
Bridge does not know that it is a fragmented packet and forwards it
directly, after NF_CONNTRACK_BRIDGE is enabled, function nf_br_ip_fragment
will check and fraglist this packet.
Some network devices that would not able to ping large packet under bridge,
but large packet ping is successful if not enable NF_CONNTRACK_BRIDGE.
In function nf_br_ip_fragment, checking the headroom before sending is
undoubted, but it is unreasonable to directly drop skb with insufficient
headroom.
Using skb_copy_expand to expand the headroom of skb instead of dropping
it.
Signed-off-by: Huajian Yang <huajiany...@asrmicro.com>
---
net/bridge/netfilter/nf_conntrack_bridge.c | 14 ++++++++++++--
net/ipv6/netfilter.c | 14 ++++++++++++--
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c
b/net/bridge/netfilter/nf_conntrack_bridge.c
index 816bb0fde718..b8fb81a49377 100644
--- a/net/bridge/netfilter/nf_conntrack_bridge.c
+++ b/net/bridge/netfilter/nf_conntrack_bridge.c
@@ -62,7 +62,7 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk,
if (first_len - hlen > mtu ||
skb_headroom(skb) < ll_rs)
- goto blackhole;
+ goto expand_headroom;
if (skb_cloned(skb))
goto slow_path;
@@ -70,7 +70,7 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk,
skb_walk_frags(skb, frag) {
if (frag->len > mtu ||
skb_headroom(frag) < hlen + ll_rs)
- goto blackhole;
+ goto expand_headroom;
if (skb_shared(frag))
goto slow_path;
@@ -97,6 +97,16 @@ static int nf_br_ip_fragment(struct net *net, struct sock
*sk,
return err;
}
+
+expand_headroom:
+ struct sk_buff *expand_skb;
+
+ expand_skb = skb_copy_expand(skb, ll_rs, skb_tailroom(skb), GFP_ATOMIC);
+ if (unlikely(!expand_skb))
+ goto blackhole;
+ kfree_skb(skb);
+ skb = expand_skb;
+
slow_path:
/* This is a linearized skbuff, the original geometry is lost for us.
* This may also be a clone skbuff, we could preserve the geometry for
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index 581ce055bf52..cb67c31971e0 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -166,7 +166,7 @@ int br_ip6_fragment(struct net *net, struct sock *sk,
struct sk_buff *skb,
if (first_len - hlen > mtu ||
skb_headroom(skb) < (hroom + sizeof(struct frag_hdr)))
- goto blackhole;
+ goto expand_headroom;
if (skb_cloned(skb))
goto slow_path;
@@ -174,7 +174,7 @@ int br_ip6_fragment(struct net *net, struct sock *sk,
struct sk_buff *skb,
skb_walk_frags(skb, frag2) {
if (frag2->len > mtu ||
skb_headroom(frag2) < (hlen + hroom + sizeof(struct
frag_hdr)))
- goto blackhole;
+ goto expand_headroom;
/* Partially cloned skb? */
if (skb_shared(frag2))
@@ -208,6 +208,16 @@ int br_ip6_fragment(struct net *net, struct sock *sk,
struct sk_buff *skb,
kfree_skb_list(iter.frag);
return err;
}
+
+expand_headroom:
+ struct sk_buff *expand_skb;
+
+ expand_skb = skb_copy_expand(skb, hroom, skb_tailroom(skb), GFP_ATOMIC);
+ if (unlikely(!expand_skb))
+ goto blackhole;
+ kfree_skb(skb);
+ skb = expand_skb;
+
slow_path:
/* This is a linearized skbuff, the original geometry is lost for us.
* This may also be a clone skbuff, we could preserve the geometry for
--
2.48.1
