Patchwork macvlan: Move skb_clone check closer to call

login
register
mail settings
Submitter Herbert Xu
Date Sept. 7, 2013, 2:27 a.m.
Message ID <20130907022711.GA22613@gondor.apana.org.au>
Download mbox | patch
Permalink /patch/273360/
State Accepted
Delegated to: David Miller
Headers show

Comments

Herbert Xu - Sept. 7, 2013, 2:27 a.m.
Currently macvlan calls skb_clone in macvlan_broadcast but checks
for a NULL return in macvlan_broadcast_one instead.  This is
needlessly confusing and may lead to bugs introduced later.

This patch moves the error check to where the skb_clone call is.

The only other caller of macvlan_broadcast_one never passes in a
NULL value so it doesn't need the check either.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>


Thanks,
Simon Horman - Sept. 10, 2013, 1:38 a.m.
On Sat, Sep 07, 2013 at 12:27:11PM +1000, Herbert Xu wrote:
> Currently macvlan calls skb_clone in macvlan_broadcast but checks
> for a NULL return in macvlan_broadcast_one instead.  This is
> needlessly confusing and may lead to bugs introduced later.
> 
> This patch moves the error check to where the skb_clone call is.
> 
> The only other caller of macvlan_broadcast_one never passes in a
> NULL value so it doesn't need the check either.
> 
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

This seems good to me as macvlan_handle_frame(), which is
the only other caller of macvlan_broadcast_one(), already checks
that skb is non-NULL before calling macvlan_handle_frame().

Reviewed-by: Simon Horman <horms@verge.net.au>

> diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
> index 64dfaa3..9bf46bd 100644
> --- a/drivers/net/macvlan.c
> +++ b/drivers/net/macvlan.c
> @@ -118,8 +118,6 @@ static int macvlan_broadcast_one(struct sk_buff *skb,
>  				 const struct ethhdr *eth, bool local)
>  {
>  	struct net_device *dev = vlan->dev;
> -	if (!skb)
> -		return NET_RX_DROP;
>  
>  	if (local)
>  		return vlan->forward(dev, skb);
> @@ -171,9 +169,13 @@ static void macvlan_broadcast(struct sk_buff *skb,
>  			hash = mc_hash(vlan, eth->h_dest);
>  			if (!test_bit(hash, vlan->mc_filter))
>  				continue;
> +
> +			err = NET_RX_DROP;
>  			nskb = skb_clone(skb, GFP_ATOMIC);
> -			err = macvlan_broadcast_one(nskb, vlan, eth,
> -					 mode == MACVLAN_MODE_BRIDGE);
> +			if (likely(nskb))
> +				err = macvlan_broadcast_one(
> +					nskb, vlan, eth,
> +					mode == MACVLAN_MODE_BRIDGE);
>  			macvlan_count_rx(vlan, skb->len + ETH_HLEN,
>  					 err == NET_RX_SUCCESS, 1);
>  		}
> 
> Thanks,
> -- 
> Email: Herbert Xu <herbert@gondor.apana.org.au>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Sept. 11, 2013, 8:04 p.m.
From: Simon Horman <horms@verge.net.au>
Date: Tue, 10 Sep 2013 10:38:10 +0900

> On Sat, Sep 07, 2013 at 12:27:11PM +1000, Herbert Xu wrote:
>> Currently macvlan calls skb_clone in macvlan_broadcast but checks
>> for a NULL return in macvlan_broadcast_one instead.  This is
>> needlessly confusing and may lead to bugs introduced later.
>> 
>> This patch moves the error check to where the skb_clone call is.
>> 
>> The only other caller of macvlan_broadcast_one never passes in a
>> NULL value so it doesn't need the check either.
>> 
>> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> 
> This seems good to me as macvlan_handle_frame(), which is
> the only other caller of macvlan_broadcast_one(), already checks
> that skb is non-NULL before calling macvlan_handle_frame().
> 
> Reviewed-by: Simon Horman <horms@verge.net.au>

Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 64dfaa3..9bf46bd 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -118,8 +118,6 @@  static int macvlan_broadcast_one(struct sk_buff *skb,
 				 const struct ethhdr *eth, bool local)
 {
 	struct net_device *dev = vlan->dev;
-	if (!skb)
-		return NET_RX_DROP;
 
 	if (local)
 		return vlan->forward(dev, skb);
@@ -171,9 +169,13 @@  static void macvlan_broadcast(struct sk_buff *skb,
 			hash = mc_hash(vlan, eth->h_dest);
 			if (!test_bit(hash, vlan->mc_filter))
 				continue;
+
+			err = NET_RX_DROP;
 			nskb = skb_clone(skb, GFP_ATOMIC);
-			err = macvlan_broadcast_one(nskb, vlan, eth,
-					 mode == MACVLAN_MODE_BRIDGE);
+			if (likely(nskb))
+				err = macvlan_broadcast_one(
+					nskb, vlan, eth,
+					mode == MACVLAN_MODE_BRIDGE);
 			macvlan_count_rx(vlan, skb->len + ETH_HLEN,
 					 err == NET_RX_SUCCESS, 1);
 		}