mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
Bluetooth: hci_conn: Refactor hci_bind_bis() since it always succeeds
[ Upstream commita00a29b0ee
] The compiler thinks "conn" might be NULL after a call to hci_bind_bis(), which cannot happen. Avoid any confusion by just making it not return a value since it cannot fail. Fixes the warnings seen with GCC 13: In function 'arch_atomic_dec_and_test', inlined from 'atomic_dec_and_test' at ../include/linux/atomic/atomic-instrumented.h:576:9, inlined from 'hci_conn_drop' at ../include/net/bluetooth/hci_core.h:1391:6, inlined from 'hci_connect_bis' at ../net/bluetooth/hci_conn.c:2124:3: ../arch/x86/include/asm/rmwcc.h:37:9: warning: array subscript 0 is outside array bounds of 'atomic_t[0]' [-Warray-bounds=] 37 | asm volatile (fullop CC_SET(cc) \ | ^~~ ... In function 'hci_connect_bis': cc1: note: source object is likely at address zero Fixes:eca0ae4aea
("Bluetooth: Add initial implementation of BIS connections") Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Johan Hedberg <johan.hedberg@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: linux-bluetooth@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Simon Horman <simon.horman@corigine.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
a5f024d0e6
commit
1913ff10fc
1 changed files with 3 additions and 9 deletions
|
@ -1983,16 +1983,14 @@ static void hci_iso_qos_setup(struct hci_dev *hdev, struct hci_conn *conn,
|
|||
qos->latency = conn->le_conn_latency;
|
||||
}
|
||||
|
||||
static struct hci_conn *hci_bind_bis(struct hci_conn *conn,
|
||||
struct bt_iso_qos *qos)
|
||||
static void hci_bind_bis(struct hci_conn *conn,
|
||||
struct bt_iso_qos *qos)
|
||||
{
|
||||
/* Update LINK PHYs according to QoS preference */
|
||||
conn->le_tx_phy = qos->out.phy;
|
||||
conn->le_tx_phy = qos->out.phy;
|
||||
conn->iso_qos = *qos;
|
||||
conn->state = BT_BOUND;
|
||||
|
||||
return conn;
|
||||
}
|
||||
|
||||
static int create_big_sync(struct hci_dev *hdev, void *data)
|
||||
|
@ -2128,11 +2126,7 @@ struct hci_conn *hci_connect_bis(struct hci_dev *hdev, bdaddr_t *dst,
|
|||
if (IS_ERR(conn))
|
||||
return conn;
|
||||
|
||||
conn = hci_bind_bis(conn, qos);
|
||||
if (!conn) {
|
||||
hci_conn_drop(conn);
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
hci_bind_bis(conn, qos);
|
||||
|
||||
/* Add Basic Announcement into Peridic Adv Data if BASE is set */
|
||||
if (base_len && base) {
|
||||
|
|
Loading…
Reference in a new issue