Bluetooth: Use list _safe deleting from conn chan_list
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Thu, 2 Feb 2012 08:32:18 +0000 (10:32 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Mon, 13 Feb 2012 15:01:32 +0000 (17:01 +0200)
Fixes possible bug when deleting element from the list in
function hci_chan_list_flush. list_for_each_entry_rcu is used
and after deleting element from the list we also free pointer
and then list_entry_rcu is taken from freed pointer.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
net/bluetooth/hci_conn.c

index b074bd698cf6c3fae6044992fa8c9fff5ed13199..b4ecddee11b54fbf2c4da04377bd45f7934506fe 100644 (file)
@@ -975,10 +975,10 @@ int hci_chan_del(struct hci_chan *chan)
 
 void hci_chan_list_flush(struct hci_conn *conn)
 {
-       struct hci_chan *chan;
+       struct hci_chan *chan, *n;
 
        BT_DBG("conn %p", conn);
 
-       list_for_each_entry_rcu(chan, &conn->chan_list, list)
+       list_for_each_entry_safe(chan, n, &conn->chan_list, list)
                hci_chan_del(chan);
 }