Bluetooth: Fix memory leak with L2CAP signal channels
Subsystems (2)
Marcel Holtmann
maintainerPATCH 1/1 Bluetooth: Fix memory leak with L2CAP signal channels
The wrong type of L2CAP signalling packets on the wrong type of either BR/EDR or LE links need to be dropped. When that happens the packet is dropped, but the memory not freed. So actually free the memory as well.
Signed-off-by Marcel Holtmann <[email protected]>
--- net/bluetooth/l2cap_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_core.c +4 -2
@@ -5330,7 +5330,7 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,l2cap_raw_recv (conn, skb);if (hcon->type !=LE_LINK ) -return ; + goto drop;while (len >=L2CAP_CMD_HDR_SIZE ) {u16 cmd_len;
@@ -5363,6 +5363,7 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn, len -= cmd_len; } +drop:kfree_skb (skb); }
@@ -5378,7 +5379,7 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn,l2cap_raw_recv (conn, skb);if (hcon->type !=ACL_LINK ) -return ; + goto drop;while (len >=L2CAP_CMD_HDR_SIZE ) {u16 cmd_len;
@@ -5411,6 +5412,7 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn, len -= cmd_len; } +drop:kfree_skb (skb); }
Signature · 1 line
1.8.3.1
Hi Marcel,
2013-10-02 Marcel Holtmann <[email protected]>:
Quoted 9 lines
The wrong type of L2CAP signalling packets on the wrong type of either BR/EDR or LE links need to be dropped. When that happens the packet is dropped, but the memory not freed. So actually free the memory as well.
Signed-off-by Marcel Holtmann <[email protected]>--- net/bluetooth/l2cap_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Patch has been applied to bluetooth-next. Thanks.
Gustavo