Bluetooth: ISO: Fix BIS connection dst_type handling

[ Upstream commit f0c200a4a537f8f374584a974518b0ce69eda76c ]

Socket dst_type cannot be directly assigned to hci_conn->type since
there domain is different which may lead to the wrong address type being
used.

Fixes: 6a5ad251b7cd ("Bluetooth: ISO: Fix possible circular locking dependency")
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index f48a694b004abea8d979aad0043a4f3694b7373d..c9a262f97678bd1c530341f8d1850533d90d5f1e 100644 (file)
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -1927,7 +1927,7 @@ static void iso_conn_ready(struct iso_conn *conn)
                 */
                if (!bacmp(&hcon->dst, BDADDR_ANY)) {
                        bacpy(&hcon->dst, &iso_pi(parent)->dst);
-                       hcon->dst_type = iso_pi(parent)->dst_type;
+                       hcon->dst_type = le_addr_type(iso_pi(parent)->dst_type);
                }
 
                if (ev3) {