Bluetooth: Stop sabotaging list poisoning
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>
This commit is contained in:
parent
d446278c40
commit
835a6a2f86
@ -1601,7 +1601,7 @@ int l2cap_register_user(struct l2cap_conn *conn, struct l2cap_user *user)
|
|||||||
|
|
||||||
hci_dev_lock(hdev);
|
hci_dev_lock(hdev);
|
||||||
|
|
||||||
if (user->list.next || user->list.prev) {
|
if (!list_empty(&user->list)) {
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
@ -1631,12 +1631,10 @@ void l2cap_unregister_user(struct l2cap_conn *conn, struct l2cap_user *user)
|
|||||||
|
|
||||||
hci_dev_lock(hdev);
|
hci_dev_lock(hdev);
|
||||||
|
|
||||||
if (!user->list.next || !user->list.prev)
|
if (list_empty(&user->list))
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
|
|
||||||
list_del(&user->list);
|
list_del(&user->list);
|
||||||
user->list.next = NULL;
|
|
||||||
user->list.prev = NULL;
|
|
||||||
user->remove(conn, user);
|
user->remove(conn, user);
|
||||||
|
|
||||||
out_unlock:
|
out_unlock:
|
||||||
@ -1651,8 +1649,6 @@ static void l2cap_unregister_all_users(struct l2cap_conn *conn)
|
|||||||
while (!list_empty(&conn->users)) {
|
while (!list_empty(&conn->users)) {
|
||||||
user = list_first_entry(&conn->users, struct l2cap_user, list);
|
user = list_first_entry(&conn->users, struct l2cap_user, list);
|
||||||
list_del(&user->list);
|
list_del(&user->list);
|
||||||
user->list.next = NULL;
|
|
||||||
user->list.prev = NULL;
|
|
||||||
user->remove(conn, user);
|
user->remove(conn, user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user