FAILED: patch "[PATCH] Bluetooth: mgmt: fix UAF in pair command cancellation" failed to apply to 6.1-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x d0a7b48ad0921bd88effaee10bf970ab1d5d0ddd
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026080548-angelfish-scored-d506@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d0a7b48ad0921bd88effaee10bf970ab1d5d0ddd Mon Sep 17 00:00:00 2001
From: Zihan Xi <[email protected]>
Date: Tue, 21 Jul 2026 22:36:07 +0800
Subject: [PATCH] Bluetooth: mgmt: fix UAF in pair command cancellation
The pairing completion and authentication failure callbacks look up the pending MGMT_OP_PAIR_DEVICE command by walking hdev->mgmt_pending. The lookup returned a command that was still linked on the shared pending list, without keeping mgmt_pending_lock held for the later dereference and removal.
A concurrent MGMT_OP_CANCEL_PAIR_DEVICE request can remove and free the same pending command before the callback uses it. The reverse race is also possible when cancel_pair_device() gets a command from pending_find() and a callback removes it before the cancel path dereferences it. This can lead to a use-after-free and a second list_del().
Make the pairing lookup helpers transfer ownership of the pending command by removing it from hdev->mgmt_pending while holding mgmt_pending_lock. The callbacks and cancel path then complete the command and free it directly, so racing paths cannot find or free the same command again. Take a temporary hci_conn reference in cancel_pair_device() because the command completion drops the reference stored in the pending command.
net/bluetooth/mgmt.c +46 -18
@@ -3514,11 +3514,13 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data, NULL, 0); } -static struct mgmt_pending_cmd *find_pairing (struct hci_conn *conn) +static struct mgmt_pending_cmd *remove_pairing (struct hci_conn *conn) {struct hci_dev *hdev = conn->hdev;struct mgmt_pending_cmd *cmd; +mutex_lock (&hdev->mgmt_pending_lock); +list_for_each_entry (cmd, &hdev->mgmt_pending, list) {if (cmd->opcode !=MGMT_OP_PAIR_DEVICE )continue ;
@@ -3526,9 +3528,39 @@ static struct mgmt_pending_cmd *find_pairing(struct hci_conn *conn)if (cmd->user_data != conn)continue ; +list_del (&cmd->list); +mutex_unlock (&hdev->mgmt_pending_lock);return cmd; } +mutex_unlock (&hdev->mgmt_pending_lock); + +return NULL ; +} + +static struct mgmt_pending_cmd *remove_pairing_by_addr (struct hci_dev *hdev, +bdaddr_t *bdaddr) +{ +struct mgmt_pending_cmd *cmd; +struct hci_conn *conn; + +mutex_lock (&hdev->mgmt_pending_lock); + +list_for_each_entry (cmd, &hdev->mgmt_pending, list) { +if (cmd->opcode !=MGMT_OP_PAIR_DEVICE ) +continue ; + + conn = cmd->user_data; +if (bacmp (bdaddr, &conn->dst) !=0 ) +continue ; + +list_del (&cmd->list); +mutex_unlock (&hdev->mgmt_pending_lock); +return cmd; + } + +mutex_unlock (&hdev->mgmt_pending_lock); +return NULL ; }
@@ -3566,10 +3598,10 @@ void mgmt_smp_complete(struct hci_conn *conn, bool complete)u8 status = complete ?MGMT_STATUS_SUCCESS :MGMT_STATUS_FAILED ;struct mgmt_pending_cmd *cmd; - cmd =find_pairing (conn); + cmd =remove_pairing (conn);if (cmd) { cmd->cmd_complete (cmd, status); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); } }
@@ -3579,14 +3611,14 @@ static void pairing_complete_cb(struct hci_conn *conn, u8 status)BT_DBG ("status %u" , status); - cmd =find_pairing (conn); + cmd =remove_pairing (conn);if (!cmd) {BT_DBG ("Unable to find a pending command" );return ; } cmd->cmd_complete (cmd,mgmt_status (status)); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); }static void le_pairing_complete_cb (struct hci_conn *conn,u8 status)
@@ -3598,14 +3630,14 @@ static void le_pairing_complete_cb(struct hci_conn *conn, u8 status)if (!status)return ; - cmd =find_pairing (conn); + cmd =remove_pairing (conn);if (!cmd) {BT_DBG ("Unable to find a pending command" );return ; } cmd->cmd_complete (cmd,mgmt_status (status)); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); } static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
@@ -3762,23 +3794,17 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data, goto unlock; } - cmd =pending_find (MGMT_OP_PAIR_DEVICE , hdev); + cmd =remove_pairing_by_addr (hdev, &addr->bdaddr);if (!cmd) { err =mgmt_cmd_status (sk, hdev->id,MGMT_OP_CANCEL_PAIR_DEVICE ,MGMT_STATUS_INVALID_PARAMS ); goto unlock; } - conn = cmd->user_data; - -if (bacmp (&addr->bdaddr, &conn->dst) !=0 ) { - err =mgmt_cmd_status (sk, hdev->id,MGMT_OP_CANCEL_PAIR_DEVICE , -MGMT_STATUS_INVALID_PARAMS ); - goto unlock; - } + conn =hci_conn_get (cmd->user_data); cmd->cmd_complete (cmd,MGMT_STATUS_CANCELLED ); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); err =mgmt_cmd_complete (sk, hdev->id,MGMT_OP_CANCEL_PAIR_DEVICE ,0 , addr,sizeof (*addr));
@@ -3796,6 +3822,8 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data,if (conn->conn_reason ==CONN_REASON_PAIR_DEVICE )hci_abort_conn (conn,HCI_ERROR_REMOTE_USER_TERM ); +hci_conn_put (conn); + unlock:hci_dev_unlock (hdev);return err;
@@ -10137,14 +10165,14 @@ void mgmt_auth_failed(struct hci_conn *conn, u8 hci_status) ev.addr.type =link_to_bdaddr (conn->type, conn->dst_type); ev.status = status; - cmd =find_pairing (conn); + cmd =remove_pairing (conn);mgmt_event (MGMT_EV_AUTH_FAILED , conn->hdev, &ev,sizeof (ev), cmd ? cmd->sk :NULL );if (cmd) { cmd->cmd_complete (cmd, status); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); } }
Sasha Levin
maintainerPATCH 1/6 Bluetooth: HCI: Remove HCI_AMP support
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 84a4bb6548a29326564f0e659fb8064503ecc1c7 ]
Since BT_HS has been remove HCI_AMP controllers no longer has any use so remove it along with the capability of creating AMP controllers.
Since we no longer need to differentiate between AMP and Primary controllers, as only HCI_PRIMARY is left, this also remove hdev->dev_type altogether.
Stable-dep-of: d0a7b48ad092 ("Bluetooth: mgmt: fix UAF in pair command cancellation")
--- drivers/bluetooth/btmrvl_main.c | 9 -- drivers/bluetooth/btrsi.c | 1 - drivers/bluetooth/btsdio.c | 8 -- drivers/bluetooth/btusb.c | 5 -- drivers/bluetooth/hci_ldisc.c | 6 -- drivers/bluetooth/hci_serdev.c | 5 -- drivers/bluetooth/hci_uart.h | 1 - drivers/bluetooth/hci_vhci.c | 10 +-- drivers/bluetooth/virtio_bt.c | 2 - include/net/bluetooth/hci.h | 114 ------------------------ include/net/bluetooth/hci_core.h | 46 +--------- include/uapi/linux/virtio_bt.h | 1 - net/bluetooth/hci_conn.c | 24 ++--- net/bluetooth/hci_core.c | 131 +++------------------------ net/bluetooth/hci_event.c | 147 ------------------------------- net/bluetooth/hci_sock.c | 5 +- net/bluetooth/hci_sync.c | 112 +---------------------- net/bluetooth/l2cap_core.c | 21 +---- net/bluetooth/mgmt.c | 84 ++++++------------ 19 files changed, 55 insertions(+), 677 deletions(-)
drivers/bluetooth/btmrvl_main.c +0 -9
@@ -121,13 +121,6 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) ((event->data[2 ] ==MODULE_BROUGHT_UP ) || (event->data[2 ] ==MODULE_ALREADY_UP )) ? "Bring-up succeed" : "Bring-up failed"); - -if (event->length >3 && event->data[3 ]) - priv->btmrvl_dev.dev_type =HCI_AMP ; -else - priv->btmrvl_dev.dev_type =HCI_PRIMARY ; - -BT_DBG ("dev_type: %d" , priv->btmrvl_dev.dev_type); }else if (priv->btmrvl_dev.sendcmdflag && event->data[1 ] ==MODULE_SHUTDOWN_REQ ) { BT_DBG("EVENT:%s", (event->data[2]) ?
@@ -686,8 +679,6 @@ int btmrvl_register_hdev(struct btmrvl_private *priv) hdev->wakeup = btmrvl_wakeup;SET_HCIDEV_DEV (hdev, &card->func->dev); - hdev->dev_type = priv->btmrvl_dev.dev_type; - ret =hci_register_dev (hdev);if (ret <0 ) {BT_ERR ("Can not register HCI device" );
drivers/bluetooth/btrsi.c +0 -1
@@ -134,7 +134,6 @@ static int rsi_hci_attach(void *priv, struct rsi_proto_ops *ops) hdev->bus =HCI_USB ;hci_set_drvdata (hdev, h_adapter); - hdev->dev_type =HCI_PRIMARY ; hdev->open = rsi_hci_open; hdev->close = rsi_hci_close; hdev->flush = rsi_hci_flush;
drivers/bluetooth/btsdio.c +0 -8
@@ -32,9 +32,6 @@ static const struct sdio_device_id btsdio_table[] = {/* Generic Bluetooth Type-B SDIO device */ { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_B) }, -/* Generic Bluetooth AMP controller */ - { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_AMP) }, - { }/* Terminating entry */ };
@@ -319,11 +316,6 @@ static int btsdio_probe(struct sdio_func *func, hdev->bus =HCI_SDIO ;hci_set_drvdata (hdev, data); -if (id->class ==SDIO_CLASS_BT_AMP ) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; - data->hdev = hdev;SET_HCIDEV_DEV (hdev, &func->dev);
drivers/bluetooth/btusb.c +0 -5
@@ -3952,11 +3952,6 @@ static int btusb_probe(struct usb_interface *intf, hdev->bus =HCI_USB ;hci_set_drvdata (hdev, data); -if (id->driver_info &BTUSB_AMP ) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; - data->hdev = hdev;SET_HCIDEV_DEV (hdev, &intf->dev);
drivers/bluetooth/hci_ldisc.c +0 -6
@@ -700,11 +700,6 @@ static int hci_uart_register_dev(struct hci_uart *hu)if (!test_bit (HCI_UART_RESET_ON_INIT , &hu->hdev_flags))set_bit (HCI_QUIRK_RESET_ON_CLOSE , &hdev->quirks); -if (test_bit (HCI_UART_CREATE_AMP , &hu->hdev_flags)) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; -/* Only call open() for the protocol after hdev is fully initialized as * open() (or a timer/workqueue it starts) may attempt to reference it. */
@@ -766,7 +761,6 @@ static int hci_uart_set_flags(struct hci_uart *hu, unsigned long flags) {unsigned long valid_flags =BIT (HCI_UART_RAW_DEVICE ) |BIT (HCI_UART_RESET_ON_INIT ) | -BIT (HCI_UART_CREATE_AMP ) |BIT (HCI_UART_INIT_PENDING ) |BIT (HCI_UART_EXT_CONFIG ) |BIT (HCI_UART_VND_DETECT );
drivers/bluetooth/hci_serdev.c +0 -5
@@ -365,11 +365,6 @@ int hci_uart_register_device(struct hci_uart *hu,if (test_bit (HCI_UART_EXT_CONFIG , &hu->hdev_flags))set_bit (HCI_QUIRK_EXTERNAL_CONFIG , &hdev->quirks); -if (test_bit (HCI_UART_CREATE_AMP , &hu->hdev_flags)) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; -if (test_bit (HCI_UART_INIT_PENDING , &hu->hdev_flags))return 0 ;
drivers/bluetooth/hci_uart.h +0 -1
@@ -37,7 +37,6 @@#define HCI_UART_RAW_DEVICE 0#define HCI_UART_RESET_ON_INIT 1 -#define HCI_UART_CREATE_AMP 2#define HCI_UART_INIT_PENDING 3#define HCI_UART_EXT_CONFIG 4#define HCI_UART_VND_DETECT 5
drivers/bluetooth/hci_vhci.c +1 -9
@@ -286,17 +286,10 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode) {struct hci_dev *hdev;struct sk_buff *skb; -__u8 dev_type;if (data->hdev)return -EBADFD ; -/* bits 0-1 are dev_type (Primary or AMP) */ - dev_type = opcode &0x03 ; - -if (dev_type !=HCI_PRIMARY && dev_type !=HCI_AMP ) -return -EINVAL ; -/* bits 2-5 are reserved (must be zero) */ if (opcode &0x3c )return -EINVAL ;
@@ -314,7 +307,6 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode) data->hdev = hdev; hdev->bus =HCI_VIRTUAL ; - hdev->dev_type = dev_type;hci_set_drvdata (hdev, data); hdev->open = vhci_open_dev;
@@ -533,7 +525,7 @@ static void vhci_open_timeout(struct work_struct *work) struct vhci_data *data = container_of(work, struct vhci_data, open_timeout.work); -vhci_create_device (data, amp ?HCI_AMP :HCI_PRIMARY ); +vhci_create_device (data,0x00 ); }static int vhci_open (struct inode *inode,struct file *file)
drivers/bluetooth/virtio_bt.c +0 -2
@@ -291,7 +291,6 @@ static int virtbt_probe(struct virtio_device *vdev)switch (type) {case VIRTIO_BT_CONFIG_TYPE_PRIMARY : -case VIRTIO_BT_CONFIG_TYPE_AMP :break ;default :return -EINVAL ;
@@ -320,7 +319,6 @@ static int virtbt_probe(struct virtio_device *vdev) vbt->hdev = hdev; hdev->bus =HCI_VIRTIO ; - hdev->dev_type = type;hci_set_drvdata (hdev, vbt); hdev->open = virtbt_open;
include/net/bluetooth/hci.h +0 -114
144 lines not on this page · raw message
include/net/bluetooth/hci_core.h +1 -45
118 lines not on this page · raw message
include/uapi/linux/virtio_bt.h +0 -1
@@ -12,7 +12,6 @@enum virtio_bt_config_type {VIRTIO_BT_CONFIG_TYPE_PRIMARY =0 , -VIRTIO_BT_CONFIG_TYPE_AMP =1 , };enum virtio_bt_config_vendor {
net/bluetooth/hci_conn.c +7 -17
@@ -1193,8 +1193,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, uint8_t src_type)list_for_each_entry (d, &hci_dev_list, list) {if (!test_bit (HCI_UP , &d->flags) || -hci_dev_test_flag (d,HCI_USER_CHANNEL ) || - d->dev_type !=HCI_PRIMARY ) +hci_dev_test_flag (d,HCI_USER_CHANNEL ))continue ;/* Simple routing:
@@ -2878,26 +2877,17 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason)switch (conn->state) {case BT_CONNECTED : -case BT_CONFIG : -if (conn->type ==AMP_LINK ) { -struct hci_cp_disconn_phy_link cp; - - cp.phy_handle =HCI_PHY_HANDLE (conn->handle); - cp.reason = reason; - r =hci_send_cmd (conn->hdev,HCI_OP_DISCONN_PHY_LINK , -sizeof (cp), &cp); - }else { -struct hci_cp_disconnect dc; +case BT_CONFIG : { +struct hci_cp_disconnect dc; - dc.handle =cpu_to_le16 (conn->handle); - dc.reason = reason; - r =hci_send_cmd (conn->hdev,HCI_OP_DISCONNECT , -sizeof (dc), &dc); - } + dc.handle =cpu_to_le16 (conn->handle); + dc.reason = reason; + r =hci_send_cmd (conn->hdev,HCI_OP_DISCONNECT ,sizeof (dc), &dc); conn->state =BT_DISCONN ;break ; + }case BT_CONNECT :if (conn->type ==LE_LINK ) {if (test_bit (HCI_CONN_SCANNING , &conn->flags))
net/bluetooth/hci_core.c +10 -121
198 lines not on this page · raw message
net/bluetooth/hci_event.c +0 -147
189 lines not on this page · raw message
net/bluetooth/hci_sock.c +1 -4
@@ -436,7 +436,7 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event)return NULL ; ni =skb_put (skb,HCI_MON_NEW_INDEX_SIZE ); - ni->type = hdev->dev_type; + ni->type =0x00 ;/* Old hdev->dev_type */ ni->bus = hdev->bus;bacpy (&ni->bdaddr, &hdev->bdaddr); memcpy_and_pad(ni->name, sizeof(ni->name), hdev->name,
@@ -950,9 +950,6 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,if (hci_dev_test_flag (hdev,HCI_UNCONFIGURED ))return -EOPNOTSUPP ; -if (hdev->dev_type !=HCI_PRIMARY ) -return -EOPNOTSUPP ; -switch (cmd) {case HCISETRAW :if (!capable (CAP_NET_ADMIN ))
net/bluetooth/hci_sync.c +4 -108
187 lines not on this page · raw message
net/bluetooth/l2cap_core.c +4 -17
@@ -4054,7 +4054,7 @@ static struct l2cap_chan *l2cap_new_connection(struct l2cap_conn *conn, }static void l2cap_connect (struct l2cap_conn *conn,struct l2cap_cmd_hdr *cmd, -u8 *data,u8 rsp_code,u8 amp_id) +u8 *data,u8 rsp_code) {struct l2cap_conn_req *req = (struct l2cap_conn_req *) data;struct l2cap_conn_rsp rsp;
@@ -4132,17 +4132,8 @@ static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, status =L2CAP_CS_AUTHOR_PEND ; chan->ops->defer (chan); }else { -/* Force pending result for AMP controllers. -* The connection will succeed after the -* physical link is up. -*/ -if (amp_id ==AMP_ID_BREDR ) { -l2cap_state_change (chan,BT_CONFIG ); - result =L2CAP_CR_SUCCESS ; - }else { -l2cap_state_change (chan,BT_CONNECT2 ); - result =L2CAP_CR_PEND ; - } +l2cap_state_change (chan,BT_CONFIG ); + result =L2CAP_CR_SUCCESS ; status =L2CAP_CS_NO_INFO ; } }else {
@@ -4199,7 +4190,7 @@ static int l2cap_connect_req(struct l2cap_conn *conn,if (cmd_len <sizeof (struct l2cap_conn_req ))return -EPROTO ; -l2cap_connect (conn, cmd, data,L2CAP_CONN_RSP ,0 ); +l2cap_connect (conn, cmd, data,L2CAP_CONN_RSP );return 0 ; }
@@ -7802,10 +7793,6 @@ void l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)struct l2cap_conn *conn = hcon->l2cap_data;int len; -/* For AMP controller do not create l2cap conn */ -if (!conn && hcon->hdev->dev_type !=HCI_PRIMARY ) - goto drop; -if (!conn) conn =l2cap_conn_add (hcon);
net/bluetooth/mgmt.c +27 -57
133 lines not on this page · raw message
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/6 Bluetooth: hci_sync: Introduce hci_cmd_sync_run/hci_cmd_sync_run_once
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit c898f6d7b093bd71e66569cd6797c87d4056f44b ]
This introduces hci_cmd_sync_run/hci_cmd_sync_run_once which acts like hci_cmd_sync_queue/hci_cmd_sync_queue_once but runs immediately when already on hdev->cmd_sync_work context.
Stable-dep-of: d0a7b48ad092 ("Bluetooth: mgmt: fix UAF in pair command cancellation")
--- include/net/bluetooth/hci_sync.h | 4 +++ net/bluetooth/hci_sync.c | 42 ++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-)
include/net/bluetooth/hci_sync.h +4 -0
@@ -69,6 +69,10 @@ hci_cmd_sync_lookup_entry(struct hci_dev *hdev, hci_cmd_sync_work_func_t func, void *data, hci_cmd_sync_work_destroy_t destroy);int hci_cmd_sync_queue_once (struct hci_dev *hdev,hci_cmd_sync_work_func_t func,void *data,hci_cmd_sync_work_destroy_t destroy); +int hci_cmd_sync_run (struct hci_dev *hdev,hci_cmd_sync_work_func_t func, +void *data,hci_cmd_sync_work_destroy_t destroy); +int hci_cmd_sync_run_once (struct hci_dev *hdev,hci_cmd_sync_work_func_t func, +void *data,hci_cmd_sync_work_destroy_t destroy);void hci_cmd_sync_cancel_entry (struct hci_dev *hdev,struct hci_cmd_sync_work_entry *entry); bool hci_cmd_sync_dequeue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,
net/bluetooth/hci_sync.c +40 -2
60 lines not on this page · raw message
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/6 Bluetooth: MGMT: Fix not generating command complete for MGMT_OP_DISCONNECT
In reply to Sasha LevinFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 227a0cdf4a028a73dc256d0f5144b4808d718893 ]
MGMT_OP_DISCONNECT can be called while mgmt_device_connected has not been called yet, which will cause the connection procedure to be aborted, so mgmt_device_disconnected shall still respond with command complete to MGMT_OP_DISCONNECT and just not emit MGMT_EV_DEVICE_DISCONNECTED since MGMT_EV_DEVICE_CONNECTED was never sent.
To fix this MGMT_OP_DISCONNECT is changed to work similarly to other command which do use hci_cmd_sync_queue and then use hci_conn_abort to disconnect and returns the result, in order for hci_conn_abort to be used from hci_cmd_sync context it now uses hci_cmd_sync_run_once.
Stable-dep-of: d0a7b48ad092 ("Bluetooth: mgmt: fix UAF in pair command cancellation")
--- net/bluetooth/mgmt.c | 84 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-)
net/bluetooth/mgmt.c +42 -42
@@ -2956,7 +2956,12 @@ static int unpair_device_sync(struct hci_dev *hdev, void *data)if (!conn)return 0 ; -return hci_abort_conn_sync (hdev, conn,HCI_ERROR_REMOTE_USER_TERM ); +/* Disregard any possible error since the likes of hci_abort_conn_sync +* will clean up the connection no matter the error. +*/ +hci_abort_conn (conn,HCI_ERROR_REMOTE_USER_TERM ); + +return 0 ; } static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data,
@@ -3088,13 +3093,44 @@ static int unpair_device(struct sock *sk, struct hci_dev *hdev, void *data,return err; } +static void disconnect_complete (struct hci_dev *hdev,void *data,int err) +{ +struct mgmt_pending_cmd *cmd = data; + + cmd->cmd_complete (cmd,mgmt_status (err)); +mgmt_pending_free (cmd); +} + +static int disconnect_sync (struct hci_dev *hdev,void *data) +{ +struct mgmt_pending_cmd *cmd = data; +struct mgmt_cp_disconnect *cp = cmd->param; +struct hci_conn *conn; + +if (cp->addr.type ==BDADDR_BREDR ) + conn =hci_conn_hash_lookup_ba (hdev,ACL_LINK , + &cp->addr.bdaddr); +else + conn =hci_conn_hash_lookup_le (hdev, &cp->addr.bdaddr, +le_addr_type (cp->addr.type)); + +if (!conn) +return -ENOTCONN ; + +/* Disregard any possible error since the likes of hci_abort_conn_sync +* will clean up the connection no matter the error. +*/ +hci_abort_conn (conn,HCI_ERROR_REMOTE_USER_TERM ); + +return 0 ; +} +static int disconnect (struct sock *sk,struct hci_dev *hdev,void *data,u16 len) {struct mgmt_cp_disconnect *cp = data;struct mgmt_rp_disconnect rp;struct mgmt_pending_cmd *cmd; -struct hci_conn *conn;int err;bt_dev_dbg (hdev,"sock %p" , sk);
@@ -3117,27 +3153,7 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data, goto failed; } -if (pending_find (MGMT_OP_DISCONNECT , hdev)) { - err =mgmt_cmd_complete (sk, hdev->id,MGMT_OP_DISCONNECT , -MGMT_STATUS_BUSY , &rp,sizeof (rp)); - goto failed; - } - -if (cp->addr.type ==BDADDR_BREDR ) - conn =hci_conn_hash_lookup_ba (hdev,ACL_LINK , - &cp->addr.bdaddr); -else - conn =hci_conn_hash_lookup_le (hdev, &cp->addr.bdaddr, -le_addr_type (cp->addr.type)); - -if (!conn || conn->state ==BT_OPEN || conn->state ==BT_CLOSED ) { - err =mgmt_cmd_complete (sk, hdev->id,MGMT_OP_DISCONNECT , -MGMT_STATUS_NOT_CONNECTED , &rp, -sizeof (rp)); - goto failed; - } - - cmd =mgmt_pending_add (sk,MGMT_OP_DISCONNECT , hdev, data, len); + cmd =mgmt_pending_new (sk,MGMT_OP_DISCONNECT , hdev, data, len);if (!cmd) { err = -ENOMEM ; goto failed;
@@ -3145,9 +3161,10 @@ static int disconnect(struct sock *sk, struct hci_dev *hdev, void *data, cmd->cmd_complete = generic_cmd_complete; - err =hci_disconnect (conn,HCI_ERROR_REMOTE_USER_TERM ); + err =hci_cmd_sync_queue (hdev, disconnect_sync, cmd, + disconnect_complete);if (err <0 ) -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); failed:hci_dev_unlock (hdev);
@@ -9695,18 +9712,6 @@ void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn,mgmt_event_skb (skb,NULL ); } -static void disconnect_rsp (struct mgmt_pending_cmd *cmd,void *data) -{ -struct sock **sk = data; - - cmd->cmd_complete (cmd,0 ); - - *sk = cmd->sk; -sock_hold (*sk); - -mgmt_pending_remove (cmd); -} -static void unpair_device_rsp (struct mgmt_pending_cmd *cmd,void *data) {struct hci_dev *hdev = data;
@@ -9747,8 +9752,6 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,if (link_type !=ACL_LINK && link_type !=LE_LINK )return ; -mgmt_pending_foreach (MGMT_OP_DISCONNECT , hdev, disconnect_rsp, &sk); -bacpy (&ev.addr.bdaddr, bdaddr); ev.addr.type =link_to_bdaddr (link_type, addr_type); ev.reason = reason;
@@ -9761,9 +9764,6 @@ void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,if (sk)sock_put (sk); - -mgmt_pending_foreach (MGMT_OP_UNPAIR_DEVICE , hdev, unpair_device_rsp, - hdev); } void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 4/6 Bluetooth: MGMT: Remove unused mgmt_pending_find_data
In reply to Sasha LevinFrom: "Dr. David Alan Gilbert" <[email protected]>
[ Upstream commit 276af34d82f13bda0b2a4d9786c90b8bbf1cd064 ]
mgmt_pending_find_data() last use was removed in 2021 by
commit 5a7501374664 ("Bluetooth: hci_sync: Convert MGMT_OP_GET_CLOCK_INFO")
Remove it.
Stable-dep-of: d0a7b48ad092 ("Bluetooth: mgmt: fix UAF in pair command cancellation")
--- net/bluetooth/mgmt_util.c | 17 ----------------- net/bluetooth/mgmt_util.h | 4 ---- 2 files changed, 21 deletions(-)
net/bluetooth/mgmt_util.c +0 -17
@@ -229,23 +229,6 @@ struct mgmt_pending_cmd *mgmt_pending_find(unsigned short channel, u16 opcode,return NULL ; } -struct mgmt_pending_cmd *mgmt_pending_find_data (unsigned short channel, -u16 opcode, -struct hci_dev *hdev, -const void *data) -{ -struct mgmt_pending_cmd *cmd; - -list_for_each_entry (cmd, &hdev->mgmt_pending, list) { -if (cmd->user_data != data) -continue ; -if (cmd->opcode == opcode) -return cmd; - } - -return NULL ; -} -void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev,void (*cb)(struct mgmt_pending_cmd *cmd,void *data),void *data)
net/bluetooth/mgmt_util.h +0 -4
@@ -54,10 +54,6 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,struct mgmt_pending_cmd *mgmt_pending_find (unsigned short channel,u16 opcode,struct hci_dev *hdev); -struct mgmt_pending_cmd *mgmt_pending_find_data (unsigned short channel, -u16 opcode, -struct hci_dev *hdev, -const void *data);void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev,void (*cb)(struct mgmt_pending_cmd *cmd,void *data),void *data);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 5/6 Bluetooth: MGMT: Protect mgmt_pending list with its own lock
In reply to Sasha LevinFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 6fe26f694c824b8a4dbf50c635bee1302e3f099c ]
This uses a mutex to protect from concurrent access of mgmt_pending list which can cause crashes like:
==================================================================
BUG: KASAN: slab-use-after-free in hci_sock_get_channel+0x60/0x68 net/bluetooth/hci_sock.c:91 Read of size 2 at addr ffff0000c48885b2 by task syz.4.334/7318 CPU: 0 UID: 0 PID: 7318 Comm: syz.4.334 Not tainted 6.15.0-rc7-syzkaller-g187899f4124a #0 PREEMPT Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025 Call trace: show_stack+0x2c/0x3c arch/arm64/kernel/stacktrace.c:466 (C) __dump_stack+0x30/0x40 lib/dump_stack.c:94 dump_stack_lvl+0xd8/0x12c lib/dump_stack.c:120 print_address_description+0xa8/0x254 mm/kasan/report.c:408 print_report+0x68/0x84 mm/kasan/report.c:521 kasan_report+0xb0/0x110 mm/kasan/report.c:634 __asan_report_load2_noabort+0x20/0x2c mm/kasan/report_generic.c:379 hci_sock_get_channel+0x60/0x68 net/bluetooth/hci_sock.c:91 mgmt_pending_find+0x7c/0x140 net/bluetooth/mgmt_util.c:223 pending_find net/bluetooth/mgmt.c:947 [inline] remove_adv_monitor+0x44/0x1a4 net/bluetooth/mgmt.c:5445 hci_mgmt_cmd+0x780/0xc00 net/bluetooth/hci_sock.c:1712 hci_sock_sendmsg+0x544/0xbb0 net/bluetooth/hci_sock.c:1832 sock_sendmsg_nosec net/socket.c:712 [inline] __sock_sendmsg net/socket.c:727 [inline] sock_write_iter+0x25c/0x378 net/socket.c:1131 new_sync_write fs/read_write.c:591 [inline] vfs_write+0x62c/0x97c fs/read_write.c:684 ksys_write+0x120/0x210 fs/read_write.c:736 __do_sys_write fs/read_write.c:747 [inline] __se_sys_write fs/read_write.c:744 [inline] __arm64_sys_write+0x7c/0x90 fs/read_write.c:744 __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:49 el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:132 do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:151 el0_svc+0x58/0x17c arch/arm64/kernel/entry-common.c:767 el0t_64_sync_handler+0x78/0x108 arch/arm64/kernel/entry-common.c:786 el0t_64_sync+0x198/0x19c arch/arm64/kernel/entry.S:600 Allocated by task 7037: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x40/0x78 mm/kasan/common.c:68 kasan_save_alloc_info+0x44/0x54 mm/kasan/generic.c:562 poison_kmalloc_redzone mm/kasan/common.c:377 [inline] __kasan_kmalloc+0x9c/0xb4 mm/kasan/common.c:394 kasan_kmalloc include/linux/kasan.h:260 [inline] __do_kmalloc_node mm/slub.c:4327 [inline] __kmalloc_noprof+0x2fc/0x4c8 mm/slub.c:4339 kmalloc_noprof include/linux/slab.h:909 [inline] sk_prot_alloc+0xc4/0x1f0 net/core/sock.c:2198 sk_alloc+0x44/0x3ac net/core/sock.c:2254 bt_sock_alloc+0x4c/0x300 net/bluetooth/af_bluetooth.c:148 hci_sock_create+0xa8/0x194 net/bluetooth/hci_sock.c:2202 bt_sock_create+0x14c/0x24c net/bluetooth/af_bluetooth.c:132 __sock_create+0x43c/0x91c net/socket.c:1541 sock_create net/socket.c:1599 [inline] __sys_socket_create net/socket.c:1636 [inline] __sys_socket+0xd4/0x1c0 net/socket.c:1683 __do_sys_socket net/socket.c:1697 [inline] __se_sys_socket net/socket.c:1695 [inline] __arm64_sys_socket+0x7c/0x94 net/socket.c:1695 __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] invoke_syscall+0x98/0x2b8 arch/arm64/kernel/syscall.c:49 el0_svc_common+0x130/0x23c arch/arm64/kernel/syscall.c:132 do_el0_svc+0x48/0x58 arch/arm64/kernel/syscall.c:151 el0_svc+0x58/0x17c arch/arm64/kernel/entry-common.c:767 el0t_64_sync_handler+0x78/0x108 arch/arm64/kernel/entry-common.c:786 el0t_64_sync+0x198/0x19c arch/arm64/kernel/entry.S:600 Freed by task 6607: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x40/0x78 mm/kasan/common.c:68 kasan_save_free_info+0x58/0x70 mm/kasan/generic.c:576 poison_slab_object mm/kasan/common.c:247 [inline] __kasan_slab_free+0x68/0x88 mm/kasan/common.c:264 kasan_slab_free include/linux/kasan.h:233 [inline] slab_free_hook mm/slub.c:2380 [inline] slab_free mm/slub.c:4642 [inline] kfree+0x17c/0x474 mm/slub.c:4841 sk_prot_free net/core/sock.c:2237 [inline] __sk_destruct+0x4f4/0x760 net/core/sock.c:2332 sk_destruct net/core/sock.c:2360 [inline] __sk_free+0x320/0x430 net/core/sock.c:2371 sk_free+0x60/0xc8 net/core/sock.c:2382 sock_put include/net/sock.h:1944 [inline] mgmt_pending_free+0x88/0x118 net/bluetooth/mgmt_util.c:290 mgmt_pending_remove+0xec/0x104 net/bluetooth/mgmt_util.c:298 mgmt_set_powered_complete+0x418/0x5cc net/bluetooth/mgmt.c:1355 hci_cmd_sync_work+0x204/0x33c net/bluetooth/hci_sync.c:334 process_one_work+0x7e8/0x156c kernel/workqueue.c:3238 process_scheduled_works kernel/workqueue.c:3319 [inline] worker_thread+0x958/0xed8 kernel/workqueue.c:3400 kthread+0x5fc/0x75c kernel/kthread.c:464 ret_from_fork+0x10/0x20 arch/arm64/kernel/entry.S:847
Stable-dep-of: d0a7b48ad092 ("Bluetooth: mgmt: fix UAF in pair command cancellation")
--- include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 1 + net/bluetooth/mgmt.c | 101 +++++++++++++++---------------- net/bluetooth/mgmt_util.c | 32 ++++++++-- net/bluetooth/mgmt_util.h | 4 +- 5 files changed, 80 insertions(+), 59 deletions(-)
include/net/bluetooth/hci_core.h +1 -0
@@ -543,6 +543,7 @@ struct hci_dev {struct hci_conn_hash conn_hash;struct list_head mesh_pending; +struct mutex mgmt_pending_lock;struct list_head mgmt_pending;struct list_head reject_list;struct list_head accept_list;
net/bluetooth/hci_core.c +1 -0
@@ -2513,6 +2513,7 @@ struct hci_dev *hci_alloc_dev_priv(int sizeof_priv)mutex_init (&hdev->lock);mutex_init (&hdev->req_lock); +mutex_init (&hdev->mgmt_pending_lock);ida_init (&hdev->unset_handle_ida);
net/bluetooth/mgmt.c +49 -52
331 lines not on this page · raw message
net/bluetooth/mgmt_util.c +27 -5
@@ -217,30 +217,47 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,struct mgmt_pending_cmd *mgmt_pending_find (unsigned short channel,u16 opcode,struct hci_dev *hdev) { -struct mgmt_pending_cmd *cmd; +struct mgmt_pending_cmd *cmd, *tmp; + +mutex_lock (&hdev->mgmt_pending_lock); -list_for_each_entry (cmd, &hdev->mgmt_pending, list) { +list_for_each_entry_safe (cmd, tmp, &hdev->mgmt_pending, list) {if (hci_sock_get_channel (cmd->sk) != channel)continue ; -if (cmd->opcode == opcode) + +if (cmd->opcode == opcode) { +mutex_unlock (&hdev->mgmt_pending_lock);return cmd; + } } +mutex_unlock (&hdev->mgmt_pending_lock); +return NULL ; } -void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev, +void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev,bool remove,void (*cb)(struct mgmt_pending_cmd *cmd,void *data),void *data) {struct mgmt_pending_cmd *cmd, *tmp; +mutex_lock (&hdev->mgmt_pending_lock); +list_for_each_entry_safe (cmd, tmp, &hdev->mgmt_pending, list) {if (opcode >0 && cmd->opcode != opcode)continue ; +if (remove) +list_del (&cmd->list); +cb (cmd, data); + +if (remove) +mgmt_pending_free (cmd); } + +mutex_unlock (&hdev->mgmt_pending_lock); } struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode,
@@ -254,7 +271,7 @@ struct mgmt_pending_cmd *mgmt_pending_new(struct sock *sk, u16 opcode,return NULL ; cmd->opcode = opcode; - cmd->index = hdev->id; + cmd->hdev = hdev; cmd->param =kmemdup (data, len,GFP_KERNEL );if (!cmd->param) {
@@ -280,7 +297,9 @@ struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,if (!cmd)return NULL ; +mutex_lock (&hdev->mgmt_pending_lock);list_add_tail (&cmd->list, &hdev->mgmt_pending); +mutex_unlock (&hdev->mgmt_pending_lock);return cmd; }
@@ -294,7 +313,10 @@ void mgmt_pending_free(struct mgmt_pending_cmd *cmd)void mgmt_pending_remove (struct mgmt_pending_cmd *cmd) { +mutex_lock (&cmd->hdev->mgmt_pending_lock);list_del (&cmd->list); +mutex_unlock (&cmd->hdev->mgmt_pending_lock); +mgmt_pending_free (cmd); }
net/bluetooth/mgmt_util.h +2 -2
@@ -33,7 +33,7 @@ struct mgmt_mesh_tx {struct mgmt_pending_cmd {struct list_head list;u16 opcode; -int index; +struct hci_dev *hdev;void *param;size_t param_len;struct sock *sk;
@@ -54,7 +54,7 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,struct mgmt_pending_cmd *mgmt_pending_find (unsigned short channel,u16 opcode,struct hci_dev *hdev); -void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev, +void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev,bool remove,void (*cb)(struct mgmt_pending_cmd *cmd,void *data),void *data); struct mgmt_pending_cmd *mgmt_pending_add(struct sock *sk, u16 opcode,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 6/6 Bluetooth: mgmt: fix UAF in pair command cancellation
In reply to Sasha LevinFrom: Zihan Xi <[email protected]>
[ Upstream commit d0a7b48ad0921bd88effaee10bf970ab1d5d0ddd ]
The pairing completion and authentication failure callbacks look up the pending MGMT_OP_PAIR_DEVICE command by walking hdev->mgmt_pending. The lookup returned a command that was still linked on the shared pending list, without keeping mgmt_pending_lock held for the later dereference and removal.
A concurrent MGMT_OP_CANCEL_PAIR_DEVICE request can remove and free the same pending command before the callback uses it. The reverse race is also possible when cancel_pair_device() gets a command from pending_find() and a callback removes it before the cancel path dereferences it. This can lead to a use-after-free and a second list_del().
Make the pairing lookup helpers transfer ownership of the pending command by removing it from hdev->mgmt_pending while holding mgmt_pending_lock. The callbacks and cancel path then complete the command and free it directly, so racing paths cannot find or free the same command again. Take a temporary hci_conn reference in cancel_pair_device() because the command completion drops the reference stored in the pending command.
--- net/bluetooth/mgmt.c | 64 +++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 18 deletions(-)
net/bluetooth/mgmt.c +46 -18
@@ -3343,11 +3343,13 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data, NULL, 0); } -static struct mgmt_pending_cmd *find_pairing (struct hci_conn *conn) +static struct mgmt_pending_cmd *remove_pairing (struct hci_conn *conn) {struct hci_dev *hdev = conn->hdev;struct mgmt_pending_cmd *cmd; +mutex_lock (&hdev->mgmt_pending_lock); +list_for_each_entry (cmd, &hdev->mgmt_pending, list) {if (cmd->opcode !=MGMT_OP_PAIR_DEVICE )continue ;
@@ -3355,9 +3357,39 @@ static struct mgmt_pending_cmd *find_pairing(struct hci_conn *conn)if (cmd->user_data != conn)continue ; +list_del (&cmd->list); +mutex_unlock (&hdev->mgmt_pending_lock);return cmd; } +mutex_unlock (&hdev->mgmt_pending_lock); + +return NULL ; +} + +static struct mgmt_pending_cmd *remove_pairing_by_addr (struct hci_dev *hdev, +bdaddr_t *bdaddr) +{ +struct mgmt_pending_cmd *cmd; +struct hci_conn *conn; + +mutex_lock (&hdev->mgmt_pending_lock); + +list_for_each_entry (cmd, &hdev->mgmt_pending, list) { +if (cmd->opcode !=MGMT_OP_PAIR_DEVICE ) +continue ; + + conn = cmd->user_data; +if (bacmp (bdaddr, &conn->dst) !=0 ) +continue ; + +list_del (&cmd->list); +mutex_unlock (&hdev->mgmt_pending_lock); +return cmd; + } + +mutex_unlock (&hdev->mgmt_pending_lock); +return NULL ; }
@@ -3395,10 +3427,10 @@ void mgmt_smp_complete(struct hci_conn *conn, bool complete)u8 status = complete ?MGMT_STATUS_SUCCESS :MGMT_STATUS_FAILED ;struct mgmt_pending_cmd *cmd; - cmd =find_pairing (conn); + cmd =remove_pairing (conn);if (cmd) { cmd->cmd_complete (cmd, status); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); } }
@@ -3408,14 +3440,14 @@ static void pairing_complete_cb(struct hci_conn *conn, u8 status)BT_DBG ("status %u" , status); - cmd =find_pairing (conn); + cmd =remove_pairing (conn);if (!cmd) {BT_DBG ("Unable to find a pending command" );return ; } cmd->cmd_complete (cmd,mgmt_status (status)); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); }static void le_pairing_complete_cb (struct hci_conn *conn,u8 status)
@@ -3427,14 +3459,14 @@ static void le_pairing_complete_cb(struct hci_conn *conn, u8 status)if (!status)return ; - cmd =find_pairing (conn); + cmd =remove_pairing (conn);if (!cmd) {BT_DBG ("Unable to find a pending command" );return ; } cmd->cmd_complete (cmd,mgmt_status (status)); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); } static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
@@ -3602,23 +3634,17 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data, goto unlock; } - cmd =pending_find (MGMT_OP_PAIR_DEVICE , hdev); + cmd =remove_pairing_by_addr (hdev, &addr->bdaddr);if (!cmd) { err =mgmt_cmd_status (sk, hdev->id,MGMT_OP_CANCEL_PAIR_DEVICE ,MGMT_STATUS_INVALID_PARAMS ); goto unlock; } - conn = cmd->user_data; - -if (bacmp (&addr->bdaddr, &conn->dst) !=0 ) { - err =mgmt_cmd_status (sk, hdev->id,MGMT_OP_CANCEL_PAIR_DEVICE , -MGMT_STATUS_INVALID_PARAMS ); - goto unlock; - } + conn =hci_conn_get (cmd->user_data); cmd->cmd_complete (cmd,MGMT_STATUS_CANCELLED ); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); err =mgmt_cmd_complete (sk, hdev->id,MGMT_OP_CANCEL_PAIR_DEVICE ,0 , addr,sizeof (*addr));
@@ -3637,6 +3663,8 @@ static int cancel_pair_device(struct sock *sk, struct hci_dev *hdev, void *data,hci_cmd_sync_queue (hdev, abort_conn_sync,ERR_PTR (conn->handle),NULL ); +hci_conn_put (conn); + unlock:hci_dev_unlock (hdev);return err;
@@ -9943,14 +9971,14 @@ void mgmt_auth_failed(struct hci_conn *conn, u8 hci_status) ev.addr.type =link_to_bdaddr (conn->type, conn->dst_type); ev.status = status; - cmd =find_pairing (conn); + cmd =remove_pairing (conn);mgmt_event (MGMT_EV_AUTH_FAILED , conn->hdev, &ev,sizeof (ev), cmd ? cmd->sk :NULL );if (cmd) { cmd->cmd_complete (cmd, status); -mgmt_pending_remove (cmd); +mgmt_pending_free (cmd); } }
Signature · 1 line
2.53.0