Skip to content

Commit

Permalink
Bluetooth: Stop sabotaging list poisoning
Browse files Browse the repository at this point in the history
list_del() poisons pointers with special values, no need to overwrite them.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Alexey Dobriyan authored and holtmann committed Jun 10, 2015
1 parent d446278 commit 835a6a2
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1601,7 +1601,7 @@ int l2cap_register_user(struct l2cap_conn *conn, struct l2cap_user *user)

hci_dev_lock(hdev);

if (user->list.next || user->list.prev) {
if (!list_empty(&user->list)) {
ret = -EINVAL;
goto out_unlock;
}
Expand Down Expand Up @@ -1631,12 +1631,10 @@ void l2cap_unregister_user(struct l2cap_conn *conn, struct l2cap_user *user)

hci_dev_lock(hdev);

if (!user->list.next || !user->list.prev)
if (list_empty(&user->list))
goto out_unlock;

list_del(&user->list);
user->list.next = NULL;
user->list.prev = NULL;
user->remove(conn, user);

out_unlock:
Expand All @@ -1651,8 +1649,6 @@ static void l2cap_unregister_all_users(struct l2cap_conn *conn)
while (!list_empty(&conn->users)) {
user = list_first_entry(&conn->users, struct l2cap_user, list);
list_del(&user->list);
user->list.next = NULL;
user->list.prev = NULL;
user->remove(conn, user);
}
}
Expand Down

0 comments on commit 835a6a2

Please sign in to comment.