tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: hci_conn: Remove alloc from critical section

Browse Source 
[ Upstream commit 25ab2db3e60e0e84d7cdc740ea6ae3c10fe61eaa ]

This removes the kzalloc memory allocation inside critical section in
create_pa_sync, fixing the following message that appears when the kernel
is compiled with CONFIG_DEBUG_ATOMIC_SLEEP enabled:

BUG: sleeping function called from invalid context at
include/linux/sched/mm.h:321

Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Stable-dep-of: 6d0417e4e1cf ("Bluetooth: hci_conn: Fix not setting conn_timeout for Broadcast Receiver")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Iulia Tanasescu
2024-11-11 13:47:07 +02:00
committed by Greg Kroah-Hartman
parent 3104b7d559
commit fe81c26d2d
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/bluetooth/hci_conn.c
+10 -18
View File
@@ -2079,7 +2079,7 @@ static bool hci_conn_check_create_pa_sync(struct hci_conn *conn)
static int create_pa_sync(struct hci_dev *hdev, void *data) static int create_pa_sync(struct hci_dev *hdev, void *data)
{ {
struct hci_cp_le_pa_create_sync *cp = NULL; struct hci_cp_le_pa_create_sync cp = {0};
struct hci_conn *conn; struct hci_conn *conn;
int err = 0; int err = 0;
@@ -2108,19 +2108,13 @@ static int create_pa_sync(struct hci_dev *hdev, void *data)
if (hci_conn_check_create_pa_sync(conn)) { if (hci_conn_check_create_pa_sync(conn)) {
struct bt_iso_qos *qos = &conn->iso_qos; struct bt_iso_qos *qos = &conn->iso_qos;
cp = kzalloc(sizeof(*cp), GFP_KERNEL); cp.options = qos->bcast.options;
if (!cp) { cp.sid = conn->sid;
err = -ENOMEM; cp.addr_type = conn->dst_type;
goto unlock; bacpy(&cp.addr, &conn->dst);
} cp.skip = cpu_to_le16(qos->bcast.skip);
cp.sync_timeout = cpu_to_le16(qos->bcast.sync_timeout);
cp->options = qos->bcast.options; cp.sync_cte_type = qos->bcast.sync_cte_type;
cp->sid = conn->sid;
cp->addr_type = conn->dst_type;
bacpy(&cp->addr, &conn->dst);
cp->skip = cpu_to_le16(qos->bcast.skip);
cp->sync_timeout = cpu_to_le16(qos->bcast.sync_timeout);
cp->sync_cte_type = qos->bcast.sync_cte_type;
break; break;
} }
@@ -2131,17 +2125,15 @@ unlock:
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
if (cp) { if (bacmp(&cp.addr, BDADDR_ANY)) {
hci_dev_set_flag(hdev, HCI_PA_SYNC); hci_dev_set_flag(hdev, HCI_PA_SYNC);
set_bit(HCI_CONN_CREATE_PA_SYNC, &conn->flags); set_bit(HCI_CONN_CREATE_PA_SYNC, &conn->flags);
err = __hci_cmd_sync_status(hdev, HCI_OP_LE_PA_CREATE_SYNC, err = __hci_cmd_sync_status(hdev, HCI_OP_LE_PA_CREATE_SYNC,
sizeof(*cp), cp, HCI_CMD_TIMEOUT); sizeof(cp), &cp, HCI_CMD_TIMEOUT);
if (!err) if (!err)
err = hci_update_passive_scan_sync(hdev); err = hci_update_passive_scan_sync(hdev);
kfree(cp);
if (err) { if (err) {
hci_dev_clear_flag(hdev, HCI_PA_SYNC); hci_dev_clear_flag(hdev, HCI_PA_SYNC);
clear_bit(HCI_CONN_CREATE_PA_SYNC, &conn->flags); clear_bit(HCI_CONN_CREATE_PA_SYNC, &conn->flags);