* [PATCH] Bluetooth: 6lowpan: Avoid memory leak if memory allocation fails
@ 2014-10-01 8:30 Jukka Rissanen
2014-10-02 10:48 ` Johan Hedberg
0 siblings, 1 reply; 2+ messages in thread
From: Jukka Rissanen @ 2014-10-01 8:30 UTC (permalink / raw)
To: linux-bluetooth
If skb_unshare() returns NULL, then we leak the original skb.
Solution is to use temp variable to hold the new skb.
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
net/bluetooth/6lowpan.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index add2b58..44eaad7 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -589,13 +589,17 @@ static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev)
int err = 0;
bdaddr_t addr;
u8 addr_type;
+ struct sk_buff *tmpskb;
/* We must take a copy of the skb before we modify/replace the ipv6
* header as the header could be used elsewhere
*/
- skb = skb_unshare(skb, GFP_ATOMIC);
- if (!skb)
+ tmpskb = skb_unshare(skb, GFP_ATOMIC);
+ if (!tmpskb) {
+ kfree_skb(skb);
return NET_XMIT_DROP;
+ }
+ skb = tmpskb;
/* Return values from setup_header()
* <0 - error, packet is dropped
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Bluetooth: 6lowpan: Avoid memory leak if memory allocation fails
2014-10-01 8:30 [PATCH] Bluetooth: 6lowpan: Avoid memory leak if memory allocation fails Jukka Rissanen
@ 2014-10-02 10:48 ` Johan Hedberg
0 siblings, 0 replies; 2+ messages in thread
From: Johan Hedberg @ 2014-10-02 10:48 UTC (permalink / raw)
To: Jukka Rissanen; +Cc: linux-bluetooth
Hi Jukka,
On Wed, Oct 01, 2014, Jukka Rissanen wrote:
> If skb_unshare() returns NULL, then we leak the original skb.
> Solution is to use temp variable to hold the new skb.
>
> Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
> ---
> net/bluetooth/6lowpan.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
Applied to bluetooth-next. Thanks.
Johan
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-02 10:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-01 8:30 [PATCH] Bluetooth: 6lowpan: Avoid memory leak if memory allocation fails Jukka Rissanen
2014-10-02 10:48 ` Johan Hedberg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.