diff options
| author | Mat Martineau | 2012-05-18 01:20:14 +0200 |
|---|---|---|
| committer | Johan Hedberg | 2012-06-05 05:34:02 +0200 |
| commit | 9dc9affcb776b75f6d3e5d69d6e2a679407854f1 (patch) | |
| tree | 5ad4812b587ef142760c1b586b4d07717cb69e38 | |
| parent | Bluetooth: Fix coding style in hci_core.c (diff) | |
| download | kernel-qcow2-linux-9dc9affcb776b75f6d3e5d69d6e2a679407854f1.tar.gz kernel-qcow2-linux-9dc9affcb776b75f6d3e5d69d6e2a679407854f1.tar.xz kernel-qcow2-linux-9dc9affcb776b75f6d3e5d69d6e2a679407854f1.zip | |
Bluetooth: Free allocated ERTM SREJ list if init fails
If the ERTM SREJ list is properly allocated but the retransmit list
allocation fails, the SREJ list must be freed before returning from
l2cap_ertm_init. l2cap_chan_del will not clean up the SREJ list
if l2cap_ertm_init returns a failure code.
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 24f144b72a96..078bf805cd97 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -2381,7 +2381,11 @@ static inline int l2cap_ertm_init(struct l2cap_chan *chan) if (err < 0) return err; - return l2cap_seq_list_init(&chan->retrans_list, chan->remote_tx_win); + err = l2cap_seq_list_init(&chan->retrans_list, chan->remote_tx_win); + if (err < 0) + l2cap_seq_list_free(&chan->srej_list); + + return err; } static inline __u8 l2cap_select_mode(__u8 mode, __u16 remote_feat_mask) |