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

Commit c9128951 authored by Vasundhara Volam's avatar Vasundhara Volam Committed by David S. Miller
Browse files

be2net: Fix skb double free in be_xmit_wrokarounds() failure path 



skb_padto(), skb_share_check() and __vlan_put_tag() routines free
skb when they return an error. This patch fixes be_xmit_workarounds()
to not free skb again in such cases.

Signed-off-by: default avatarVasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarSomnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ad09458

drivers/net/ethernet/emulex/benet/be_main.c

+4 −3
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ static struct sk_buff *be_xmit_workarounds(struct be_adapter *adapter, 
	 */

	if (unlikely(!BEx_chip(adapter) && skb->len <= 32)) {

		if (skb_padto(skb, 36))

			goto tx_drop;

			goto err;

		skb->len = 36;

	}
@@ -959,7 +959,7 @@ static struct sk_buff *be_xmit_workarounds(struct be_adapter *adapter, 
	    vlan_tx_tag_present(skb)) {

		skb = be_insert_vlan_in_pkt(adapter, skb, skip_hw_vlan);

		if (unlikely(!skb))

			goto tx_drop;

			goto err;

	}



	/* HW may lockup when VLAN HW tagging is requested on
@@ -981,12 +981,13 @@ static struct sk_buff *be_xmit_workarounds(struct be_adapter *adapter, 
	    be_vlan_tag_tx_chk(adapter, skb)) {

		skb = be_insert_vlan_in_pkt(adapter, skb, skip_hw_vlan);

		if (unlikely(!skb))

			goto tx_drop;

			goto err;

	}



	return skb;

tx_drop:

	dev_kfree_skb_any(skb);

err:

	return NULL;

}