summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@nokia.com>2009-12-23 13:07:14 +0200
committerMarcel Holtmann <marcel@holtmann.org>2010-01-30 05:57:20 -0800
commite420aba331f44de0eed6871441293a6124d566d1 (patch)
tree1a6b994bb9d3d083ed36c7212322e8159ebc5f13 /net
parentfcafde2e6d81aa7901f9b10e6a097592f0637b79 (diff)
downloadlinux-3.10-e420aba331f44de0eed6871441293a6124d566d1.tar.gz
linux-3.10-e420aba331f44de0eed6871441293a6124d566d1.tar.bz2
linux-3.10-e420aba331f44de0eed6871441293a6124d566d1.zip
Bluetooth: Fix memory leak in L2CAP
Move skb_clone after error confition check so it is not going potentially out of the scope. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com> Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 8acc19ed9c4..400efa26ddb 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1368,7 +1368,6 @@ static int l2cap_ertm_send(struct sock *sk)
while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk)) &&
!(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) {
- tx_skb = skb_clone(skb, GFP_ATOMIC);
if (pi->remote_max_tx &&
bt_cb(skb)->retries == pi->remote_max_tx) {
@@ -1376,6 +1375,8 @@ static int l2cap_ertm_send(struct sock *sk)
break;
}
+ tx_skb = skb_clone(skb, GFP_ATOMIC);
+
bt_cb(skb)->retries++;
control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE);