From: Alexey Dobriyan adobriyan@gmail.com
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 --- net/bluetooth/l2cap_core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 35c41fdbde16..1700c3dc3fe1 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1616,7 +1616,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; } @@ -1646,12 +1646,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: @@ -1666,8 +1664,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); } }