p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: dsa: Move skb_unshare() to dsa_switch_rcv() 

All DSA tag receive functions need to unshare the skb before mangling it, move
this to the generic dsa_switch_rcv() function which will allow us to make the
tag receive function return their mangled skb without caring about freeing a
NULL skb.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2017-04-08 08:55:22 -07:00 committed by David S. Miller
parent 9d7f9c4f78
commit 16c5dcb13a
7 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/dsa/dsa.c
View File

@ -906,6 +906,10 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
return 0; return 0;
} }
skb = skb_unshare(skb, GFP_ATOMIC);
if (!skb)
return 0;
return dst->rcv(skb, dev, pt, orig_dev); return dst->rcv(skb, dev, pt, orig_dev);
} }

5
net/dsa/tag_brcm.c
View File

@ -102,10 +102,6 @@ static int brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,
ds = dst->cpu_switch; ds = dst->cpu_switch;
skb = skb_unshare(skb, GFP_ATOMIC);
if (skb == NULL)
goto out;
if (unlikely(!pskb_may_pull(skb, BRCM_TAG_LEN))) if (unlikely(!pskb_may_pull(skb, BRCM_TAG_LEN)))
goto out_drop; goto out_drop;
@ -151,7 +147,6 @@ static int brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,
out_drop: out_drop:
kfree_skb(skb); kfree_skb(skb);
out:
return 0; return 0;
} }

5
net/dsa/tag_dsa.c
View File

@ -77,10 +77,6 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev,
int source_device; int source_device;
int source_port; int source_port;
skb = skb_unshare(skb, GFP_ATOMIC);
if (skb == NULL)
goto out;
if (unlikely(!pskb_may_pull(skb, DSA_HLEN))) if (unlikely(!pskb_may_pull(skb, DSA_HLEN)))
goto out_drop; goto out_drop;
@ -175,7 +171,6 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev,
out_drop: out_drop:
kfree_skb(skb); kfree_skb(skb);
out:
return 0; return 0;
} }

5
net/dsa/tag_edsa.c
View File

@ -90,10 +90,6 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev,
int source_device; int source_device;
int source_port; int source_port;
skb = skb_unshare(skb, GFP_ATOMIC);
if (skb == NULL)
goto out;
if (unlikely(!pskb_may_pull(skb, EDSA_HLEN))) if (unlikely(!pskb_may_pull(skb, EDSA_HLEN)))
goto out_drop; goto out_drop;
@ -194,7 +190,6 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev,
out_drop: out_drop:
kfree_skb(skb); kfree_skb(skb);
out:
return 0; return 0;
} }

5
net/dsa/tag_mtk.c
View File

@ -55,10 +55,6 @@ static int mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
int port; int port;
__be16 *phdr, hdr; __be16 *phdr, hdr;
skb = skb_unshare(skb, GFP_ATOMIC);
if (!skb)
goto out;
if (unlikely(!pskb_may_pull(skb, MTK_HDR_LEN))) if (unlikely(!pskb_may_pull(skb, MTK_HDR_LEN)))
goto out_drop; goto out_drop;
@ -105,7 +101,6 @@ static int mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
out_drop: out_drop:
kfree_skb(skb); kfree_skb(skb);
out:
return 0; return 0;
} }

5
net/dsa/tag_qca.c
View File

@ -75,10 +75,6 @@ static int qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
int port; int port;
__be16 *phdr, hdr; __be16 *phdr, hdr;
skb = skb_unshare(skb, GFP_ATOMIC);
if (!skb)
goto out;
if (unlikely(!pskb_may_pull(skb, QCA_HDR_LEN))) if (unlikely(!pskb_may_pull(skb, QCA_HDR_LEN)))
goto out_drop; goto out_drop;
@ -126,7 +122,6 @@ static int qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
out_drop: out_drop:
kfree_skb(skb); kfree_skb(skb);
out:
return 0; return 0;
} }

5
net/dsa/tag_trailer.c
View File

@ -68,10 +68,6 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev,
ds = dst->cpu_switch; ds = dst->cpu_switch;
skb = skb_unshare(skb, GFP_ATOMIC);
if (skb == NULL)
goto out;
if (skb_linearize(skb)) if (skb_linearize(skb))
goto out_drop; goto out_drop;
@ -100,7 +96,6 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev,
out_drop: out_drop:
kfree_skb(skb); kfree_skb(skb);
out:
return 0; return 0;
} }