From patchwork Thu Apr 24 16:02:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ludovico de Nittis X-Patchwork-Id: 885072 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BD4227FD48 for ; Thu, 24 Apr 2025 16:03:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510608; cv=none; b=lbrWgTIQtzXVr0dxCrxGaT2xci8itC04aA9JJ2Wlrl1FRlR4ZzLRfXgqf5PuDjCasmQjDc9Gdy5VibwOfP6yzcjMK4sUWz24eRcpKcyZEVkpAuxTxUUhZ55OnU9Grx1gSJRtygwWCqA01mz6rJAoesJxVxG8IT/d0xHJHDkvUPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510608; c=relaxed/simple; bh=VbhOsvfPzj15yFnYL9KtWMl5bGSXIe6QDJnauWIS+TI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eG8SEzmSVLaYp8Vr9u+7s7rIRtKiAXgPYV9zmEbyvZ7yXIOLk0omUyFO8U1p46xixU4R3cqIcGJ3/VXm5l5BdsYoh8gHEmF9Rrnud2vIWT5hFbrDvDPGj5O4v6gpc638PWLZHhV61nvwGcLIN2Xe8FMubPH+a6RJsQB6+wnJ4FM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=jE6euu1q; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="jE6euu1q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1745510604; bh=VbhOsvfPzj15yFnYL9KtWMl5bGSXIe6QDJnauWIS+TI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jE6euu1qElGqQ6ttWrEOmoclDzFANys/RL0ZbwPb6Tghdui9DpW14NmMhXGbQJGGL +MAhopj5FzevM4O9mzWmSSuALPcN/LclmsPxjH/mvEiM62pVR7+SH4bQwTOBDGu/15 Iw9zqJR5AqyEleAfjGwj+i1KTOOCAN0r4GijY9mWzEyO6rs+NEfjKwACDkZDrPpPqY /a5gYZe1tCJ9b9M+e5SPl/KCCaJOri5Mn07iAsYnMwgtWzTE/w53c5MrI04BkMcnBN LxECFzZ4kiULGK23vaF3o8RcPi1cxOmJo1B0SRyHs+2HeyYswuZ7eA0PnGk5WE+8bn 9kO1naWASOrXQ== Received: from localhost.localdomain (unknown [81.56.51.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: denittis) by bali.collaboradmins.com (Postfix) with ESMTPSA id 8195617E091E; Thu, 24 Apr 2025 18:03:24 +0200 (CEST) From: Ludovico de Nittis To: linux-bluetooth@vger.kernel.org Cc: Ludovico de Nittis Subject: [PATCH BlueZ v4 1/6] src: Add new CablePairing property Date: Thu, 24 Apr 2025 18:02:31 +0200 Message-ID: <20250424160236.179982-2-ludovico.denittis@collabora.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424160236.179982-1-ludovico.denittis@collabora.com> References: <20250424160236.179982-1-ludovico.denittis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This adds initial support for a new CablePairing property. The property can be used for devices that are paired using a cable and don't support the expected bonding (with pairing/encryption), for example like the Sixaxis gamepads. --- doc/org.bluez.Device.rst | 7 +++++++ src/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/device.h | 2 ++ 3 files changed, 49 insertions(+) diff --git a/doc/org.bluez.Device.rst b/doc/org.bluez.Device.rst index 13328249b..80501eddd 100644 --- a/doc/org.bluez.Device.rst +++ b/doc/org.bluez.Device.rst @@ -279,6 +279,13 @@ boolean LegacyPairing [readonly] Bluetooth 2.1 (or newer) devices that have disabled Extended Inquiry Response support. +boolean CablePairing [readonly] +``````````````````````````````` + + Set to true if the device was cable paired and it doesn't support the + canonical bonding with encryption, e.g. the Sixaxis gamepad. + If true, BlueZ will establish a connection without enforcing encryption. + string Modalias [readonly, optional] ```````````````````````````````````` diff --git a/src/device.c b/src/device.c index b82a905f9..123d44c14 100644 --- a/src/device.c +++ b/src/device.c @@ -239,6 +239,7 @@ struct btd_device { GSList *watches; /* List of disconnect_data */ bool temporary; bool connectable; + bool cable_pairing; unsigned int disconn_timer; unsigned int discov_timer; unsigned int temporary_timer; /* Temporary/disappear timer */ @@ -507,6 +508,9 @@ static gboolean store_device_info_cb(gpointer user_data) g_key_file_set_boolean(key_file, "General", "Blocked", device->blocked); + g_key_file_set_boolean(key_file, "General", "CablePairing", + device->cable_pairing); + if (device->wake_override != WAKE_FLAG_DEFAULT) { g_key_file_set_boolean(key_file, "General", "WakeAllowed", device->wake_override == @@ -908,6 +912,11 @@ bool btd_device_is_trusted(struct btd_device *device) return device->trusted; } +bool device_is_cable_pairing(struct btd_device *device) +{ + return device->cable_pairing; +} + static gboolean dev_property_get_address(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) { @@ -1153,6 +1162,17 @@ static gboolean dev_property_get_legacy(const GDBusPropertyTable *property, return TRUE; } +static gboolean dev_property_get_cable_pairing(const GDBusPropertyTable *property, + DBusMessageIter *iter, void *data) +{ + struct btd_device *device = data; + dbus_bool_t val = device->cable_pairing; + + dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &val); + + return TRUE; +} + static gboolean dev_property_get_rssi(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) { @@ -3483,6 +3503,7 @@ static const GDBusPropertyTable device_properties[] = { { "Trusted", "b", dev_property_get_trusted, dev_property_set_trusted }, { "Blocked", "b", dev_property_get_blocked, dev_property_set_blocked }, { "LegacyPairing", "b", dev_property_get_legacy }, + { "CablePairing", "b", dev_property_get_cable_pairing }, { "RSSI", "n", dev_property_get_rssi, NULL, dev_property_exists_rssi }, { "Connected", "b", dev_property_get_connected }, { "UUIDs", "as", dev_property_get_uuids }, @@ -4062,6 +4083,9 @@ next: if (blocked) device_block(device, FALSE); + device->cable_pairing = g_key_file_get_boolean(key_file, "General", + "CablePairing", NULL); + /* Load device profile list */ uuids = g_key_file_get_string_list(key_file, "General", "Services", NULL, NULL); @@ -6416,6 +6440,22 @@ void device_set_legacy(struct btd_device *device, bool legacy) DEVICE_INTERFACE, "LegacyPairing"); } +void device_set_cable_pairing(struct btd_device *device, bool cable_pairing) +{ + if (!device) + return; + + if (device->cable_pairing == cable_pairing) + return; + + DBG("setting cable pairing %d", cable_pairing); + + device->cable_pairing = cable_pairing; + + g_dbus_emit_property_changed(dbus_conn, device->path, + DEVICE_INTERFACE, "CablePairing"); +} + void device_store_svc_chng_ccc(struct btd_device *device, uint8_t bdaddr_type, uint16_t value) { diff --git a/src/device.h b/src/device.h index 2e4a9771d..a35bb1386 100644 --- a/src/device.h +++ b/src/device.h @@ -94,6 +94,7 @@ bool device_is_connectable(struct btd_device *device); bool device_is_paired(struct btd_device *device, uint8_t bdaddr_type); bool device_is_bonded(struct btd_device *device, uint8_t bdaddr_type); bool btd_device_is_trusted(struct btd_device *device); +bool device_is_cable_pairing(struct btd_device *device); void device_set_paired(struct btd_device *dev, uint8_t bdaddr_type); void device_set_unpaired(struct btd_device *dev, uint8_t bdaddr_type); void btd_device_set_temporary(struct btd_device *device, bool temporary); @@ -101,6 +102,7 @@ void btd_device_set_trusted(struct btd_device *device, gboolean trusted); void btd_device_set_connectable(struct btd_device *device, bool connectable); void device_set_bonded(struct btd_device *device, uint8_t bdaddr_type); void device_set_legacy(struct btd_device *device, bool legacy); +void device_set_cable_pairing(struct btd_device *device, bool cable_pairing); void device_set_rssi_with_delta(struct btd_device *device, int8_t rssi, int8_t delta_threshold); void device_set_rssi(struct btd_device *device, int8_t rssi); From patchwork Thu Apr 24 16:02:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ludovico de Nittis X-Patchwork-Id: 884060 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00E63199949 for ; Thu, 24 Apr 2025 16:03:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510608; cv=none; b=IpzXJj1J4f4j1Vmfoa0VRXeRiWVYTbE4k09aip/QSMHuvLGHa66pHSWCKZlmxvRW1gFBbQcu7voFTtpgMdhdem9tz6MdIhhnv+nHGtjo2kLBa3ug+DF7YaAogut3ugBvlLgCAKnVEJvBQjecz8goY/WQr3LJiVkfqIbOXuSMWss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510608; c=relaxed/simple; bh=bzbxsFCYgrgxafRDANaBXMfZ86UQF2dBN1yjTIj/svQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lIW7OqgsRLHLeWucykaaafgMfS2y9oJSl6PsGiRgWU43jfkU3PQhBk0C1CwwnjIeqmTmkSY60ExTg81DONt8JqaswSktGQEV/BxJ//Ut0tIuFLWX4OLW1iZ9FyD8fx/BfllWDUpH9yRLZVpdAGttfSOn5Eq1fS3Orc3nF6NdXUs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=PT/dbc2j; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="PT/dbc2j" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1745510605; bh=bzbxsFCYgrgxafRDANaBXMfZ86UQF2dBN1yjTIj/svQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PT/dbc2jjgN/7kyQoTX92MXNu4pM4IMAFICXtnFb0/m5t7EecmsfS8KrP4Vmkst5d BkM4MW5JA2Sz5FYlMBGeaSHWuCCnSy1GOoUZ+u1iPER18vn0576bi/QEKeewYaBlJv degy59Euukf6xDe28RjsdQ4T5tsh61pgPfBrhE7v8claaa6rXVa/syUSYvgnu2ycnl NE7Z6qrQInbheOppPsLAIFhTONhT2IuHAESLEbVwBZ/+3TOuj0/W1yX++XQIvY0eF4 97PtOGZZiUGlKr+ugtZcnP5NOvpkuq+p6IEr1CNtpZFoFMoFyv1EIM7iAr77S2EAaV q6iHzuO4wCGyg== Received: from localhost.localdomain (unknown [81.56.51.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: denittis) by bali.collaboradmins.com (Postfix) with ESMTPSA id D6EDB17E0F66; Thu, 24 Apr 2025 18:03:24 +0200 (CEST) From: Ludovico de Nittis To: linux-bluetooth@vger.kernel.org Cc: Ludovico de Nittis Subject: [PATCH BlueZ v4 2/6] client: Print CablePairing property Date: Thu, 24 Apr 2025 18:02:32 +0200 Message-ID: <20250424160236.179982-3-ludovico.denittis@collabora.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424160236.179982-1-ludovico.denittis@collabora.com> References: <20250424160236.179982-1-ludovico.denittis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When using the `info` command, include the new CablePairing value. --- client/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.c b/client/main.c index 6039aa50c..a2d9d88bf 100644 --- a/client/main.c +++ b/client/main.c @@ -1705,6 +1705,7 @@ static void cmd_info(int argc, char *argv[]) print_property(proxy, "Connected"); print_property(proxy, "WakeAllowed"); print_property(proxy, "LegacyPairing"); + print_property(proxy, "CablePairing"); print_uuids(proxy); print_property(proxy, "Modalias"); print_property(proxy, "ManufacturerData"); From patchwork Thu Apr 24 16:02:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ludovico de Nittis X-Patchwork-Id: 885071 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EDB927F751 for ; Thu, 24 Apr 2025 16:03:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510609; cv=none; b=t4YCIXqtai3cdWnCj7eI6Ck1sCC8DFhKMwWqt/hjpMO8f7ar2J/CSYlo5QlX241ObJ86h3PwORm+fxw1tREdMO7Yl2CH0lHtOLYefJr4rVV+9pC3LB88Ki7sxRwBUej3NE/qOyaiC5ObQ6kqA4O+iW/gg8WHqIQbtk0cXoH7MRs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510609; c=relaxed/simple; bh=hHHfXQPELtG6DWgR/nCNtb6UfaVSn0ZO1qZBFKpyzm4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PnZuBOA/OOe31qS1S6UC5iqxeQscB51mZscvo3U0yQBIKYgpwL30H9GOIo8R24IsomQIYXeE223QbYGtk4ykMefm36UB7pjEXEAKXqlHeEpiOLUVehSnBMFMd6rBEOksEN8HJmflPxswh5YBp+hWzhQTJTyP8TSDH2o569mcITA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=DAyjFrG9; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="DAyjFrG9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1745510605; bh=hHHfXQPELtG6DWgR/nCNtb6UfaVSn0ZO1qZBFKpyzm4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DAyjFrG9YWfBX3q2s/kg+S3TNHdRyecdQdanngDBcCqbIVp59yDtkHJ3vTyk0LuG+ 9+faMw5ttxTyH8MkK3IH2ttUBYryyt6jCYAttHZSNWuMr4m7mzRAP9TE3GhvEwgipX cxg/DS8xsWMNAJe7RiStCtTX0rv737f3d4DAt+N6Yv8M//WYxzyUjEZOG2yYiLGR4j +tRovBDmFnG8zaccMOMPVcryeVv8PaKWDb5VZxO6d1RRwTO90uKIvsLky1TdEoG8W3 iM+VXKPGSh7ulkqCi6sG9caDxiPbMez4pIsPSs9YXHQ44kXT6HJZ4SJDvby+KHtsJP bLiQnCPuLC5xg== Received: from localhost.localdomain (unknown [81.56.51.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: denittis) by bali.collaboradmins.com (Postfix) with ESMTPSA id 3F14017E3614; Thu, 24 Apr 2025 18:03:25 +0200 (CEST) From: Ludovico de Nittis To: linux-bluetooth@vger.kernel.org Cc: Ludovico de Nittis Subject: [PATCH BlueZ v4 3/6] sixaxis: Set CablePairing when pairing a Sixaxis with USB Date: Thu, 24 Apr 2025 18:02:33 +0200 Message-ID: <20250424160236.179982-4-ludovico.denittis@collabora.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424160236.179982-1-ludovico.denittis@collabora.com> References: <20250424160236.179982-1-ludovico.denittis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sixaxis gamepads don't support encryption. When doing the USB cable pairing, set the CablePairing property to keep the connection to the device unencrypted. --- plugins/sixaxis.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c index 3e69f1dd2..ea160c65d 100644 --- a/plugins/sixaxis.c +++ b/plugins/sixaxis.c @@ -296,10 +296,13 @@ static void agent_auth_cb(DBusError *derr, void *user_data) remove_device = false; btd_device_set_temporary(closure->device, false); - if (closure->type == CABLE_PAIRING_SIXAXIS) + if (closure->type == CABLE_PAIRING_SIXAXIS) { btd_device_set_record(closure->device, HID_UUID, SIXAXIS_HID_SDP_RECORD); + device_set_cable_pairing(closure->device, true); + } + ba2str(&closure->bdaddr, device_addr); ba2str(¢ral_bdaddr, central_addr); ba2str(adapter_bdaddr, adapter_addr); From patchwork Thu Apr 24 16:02:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ludovico de Nittis X-Patchwork-Id: 884059 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A457D27FD54 for ; Thu, 24 Apr 2025 16:03:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510609; cv=none; b=drD8utDtuykwBSgWYxD6zqPiinqeV9Vq5sgPIpzO08O7IBu+II4Pj4mQMcpbIta/ltB9D9goH91/1+EaSVzmXnbWNLosGeE+deB95Q+PFbToBC3vVY4CProcPuZvnPe2OdyFOV9HMFVufgSF1V60IGzfuBewvU8jfhdbidBOW5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510609; c=relaxed/simple; bh=Z8dAh6lcf30KxGjHfgKPuIjnDT7b8gS7qlLzh3QOptA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J71pPAbVidt5DqJIwlm76T1piApeAMVQEK6VdV7yAoAFhaoPZjp8Wb1IVlQcgrarixWMmgnr06KbIH7Z7sdPcEDMQtTlpjaLZtsud+mdaApPHEz64gnIK1bNMHvjUsFgj+nJwZyPc9X7VLB/Msp62KZHniEBBax7nCJF6MHdEqo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=cc8DqhvK; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="cc8DqhvK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1745510605; bh=Z8dAh6lcf30KxGjHfgKPuIjnDT7b8gS7qlLzh3QOptA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cc8DqhvKmVQTKlKKd3J7UxYsHAqzwePCn0hb4ZtHEInZb6su89OGNMVU5SV4CNqgH JK1A4U5cyPvdgPVYgPm4OZaA7I02rxHjtcVGWrlv7+tvRHnO4bU+78MujE39yixJHq tckqD9qP4Nby/kVqusgpzZ3z8iyOns9K79nembJ4PihYqEhQOS2JeD8ed3VIrYFMYr 5Mw/XZyS4nrSgk/b7FN/SHrfwhMqKDHE0O0+xYrLzsq8H5w9MOtAUOuvbWHQsZC6j3 bir3M8ztigfWabdIM7mSTbmYFwmXj0y10tNXBDZsWoTfkMhN0h/OS0W5Cj0eWDSSJb uVJRU5cEMOXIQ== Received: from localhost.localdomain (unknown [81.56.51.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: denittis) by bali.collaboradmins.com (Postfix) with ESMTPSA id 9370E17E3626; Thu, 24 Apr 2025 18:03:25 +0200 (CEST) From: Ludovico de Nittis To: linux-bluetooth@vger.kernel.org Cc: Ludovico de Nittis Subject: [PATCH BlueZ v4 4/6] adapter: Add btd_adapter_has_cable_pairing_devices() Date: Thu, 24 Apr 2025 18:02:34 +0200 Message-ID: <20250424160236.179982-5-ludovico.denittis@collabora.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424160236.179982-1-ludovico.denittis@collabora.com> References: <20250424160236.179982-1-ludovico.denittis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add a function that can be used to know if any of the known devices have the `CablePaired` property set. --- src/adapter.c | 17 +++++++++++++++++ src/adapter.h | 1 + 2 files changed, 18 insertions(+) diff --git a/src/adapter.c b/src/adapter.c index c21b38095..fd425e6d2 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -412,6 +412,23 @@ uint16_t btd_adapter_get_index(struct btd_adapter *adapter) return adapter->dev_id; } +bool btd_adapter_has_cable_pairing_devices(struct btd_adapter *adapter) +{ + GSList *l; + + if (!adapter) + return false; + + for (l = adapter->devices; l; l = l->next) { + struct btd_device *device = l->data; + + if (device_is_cable_pairing(device)) + return true; + } + + return false; +} + static gboolean process_auth_queue(gpointer user_data); static void dev_class_changed_callback(uint16_t index, uint16_t length, diff --git a/src/adapter.h b/src/adapter.h index 8dfbe762e..6b2bc28f6 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -30,6 +30,7 @@ struct queue; struct btd_adapter *btd_adapter_get_default(void); bool btd_adapter_is_default(struct btd_adapter *adapter); uint16_t btd_adapter_get_index(struct btd_adapter *adapter); +bool btd_adapter_has_cable_pairing_devices(struct btd_adapter *adapter); typedef void (*adapter_cb) (struct btd_adapter *adapter, gpointer user_data); From patchwork Thu Apr 24 16:02:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ludovico de Nittis X-Patchwork-Id: 884058 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3524B2820B9 for ; Thu, 24 Apr 2025 16:03:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510612; cv=none; b=XeSIdqU7RhwnnHDaXSnkP07i/YHgibOKA+cd6HPZRSHEDrBWFkO7NfP+sV5BJ7ffgd1sjws2NrO4zCWXdXNaO2zH7GdQZDTmQcW3zgYx9eWRCePSTVm8yCVOFocsFW5rIxEJ172bdUJEKgfgH07MaIjAHQVQu9aOUlN8wK9aruo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510612; c=relaxed/simple; bh=pUSuEiGELLJxwFbspNXX02w0xcO7ksP1hlZbyaFv1bw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YnKYHmHwIpqcygKjWj7NcryCngdt9jti86AMsCQCYdHzAArrNneA8Zey95HFDH3sw+0ESq2N+RzTGV1QGPU+UwTRo66oXADtqZCvqEcD7nxwKgI0uvN9e3w91hh/lnNffPGpL0VUTYHyYfHmvGB9AOtKyqwHUhBGY1myuRc5k9E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=FBXCAmYP; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="FBXCAmYP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1745510606; bh=pUSuEiGELLJxwFbspNXX02w0xcO7ksP1hlZbyaFv1bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FBXCAmYPcCSmEs1ABXzy/wUAB8cJpmWyS09HHsEzhlUeTroytGbGENhqy6AjSUkBD OnoN+59onX5P1+DD37uKK48cMSAuBqyE5Ze7yY57toSekVcLMl704fu5YnjKDd4kkj d+EJobuCKLFHo8l9Hh4M+JEOP9SiruzbP+AKJ+aGn3JLB1c56cJatMvcB7CGjRtEPy TPF09R4z49A8eby4UGX0M14U7SpOXhQypdCewcDpbwhPQx0HnS5go25yVqfX98lChF fcMtiLh2eaABJpefMGEXEkWaV3qp1LAI/Uio78JygAZUf/ANBlV7kDBb369Icym6Re Fg9nbm4I2o/Gg== Received: from localhost.localdomain (unknown [81.56.51.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: denittis) by bali.collaboradmins.com (Postfix) with ESMTPSA id E89C417E362C; Thu, 24 Apr 2025 18:03:25 +0200 (CEST) From: Ludovico de Nittis To: linux-bluetooth@vger.kernel.org Cc: Ludovico de Nittis Subject: [PATCH BlueZ v4 5/6] input: Automatically use sec level low when using a cable paired device Date: Thu, 24 Apr 2025 18:02:35 +0200 Message-ID: <20250424160236.179982-6-ludovico.denittis@collabora.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424160236.179982-1-ludovico.denittis@collabora.com> References: <20250424160236.179982-1-ludovico.denittis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 BT_IO_SEC_LOW is the only way to allow devices that use cable pairing to establish a connection. This adds the ability to start the listening input server with BT_IO_SEC_LOW to avoid breaking support for these devices, and then, in `hidp_add_connection()`, we check if either `classic_bonded_only` was disabled or if this device has `CablePairing`. If neither are true, we bump the security back to BT_IO_SEC_MEDIUM, i.e. enforcing encryption. This allows supporting these devices without having to change the classic bonded only option. --- profiles/input/device.c | 20 +++++++++++-- profiles/input/manager.c | 3 +- profiles/input/server.c | 63 ++++++++++++++++++++++++++++++++++++++-- profiles/input/server.h | 3 +- 4 files changed, 82 insertions(+), 7 deletions(-) diff --git a/profiles/input/device.c b/profiles/input/device.c index 3627573e7..2fa4e0b82 100644 --- a/profiles/input/device.c +++ b/profiles/input/device.c @@ -47,6 +47,7 @@ #include "device.h" #include "hidp_defs.h" +#include "server.h" #define INPUT_INTERFACE "org.bluez.Input1" @@ -1065,6 +1066,7 @@ static gboolean encrypt_notify(GIOChannel *io, GIOCondition condition, static int hidp_add_connection(struct input_device *idev) { struct hidp_connadd_req *req; + bool cable_pairing; GError *gerr = NULL; int err; @@ -1088,8 +1090,10 @@ static int hidp_add_connection(struct input_device *idev) if (device_name_known(idev->device)) device_get_name(idev->device, req->name, sizeof(req->name)); + cable_pairing = device_is_cable_pairing(idev->device); + /* Make sure the device is bonded if required */ - if (classic_bonded_only && !input_device_bonded(idev)) { + if (!cable_pairing && classic_bonded_only && !input_device_bonded(idev)) { error("Rejected connection from !bonded device %s", idev->path); goto cleanup; } @@ -1098,7 +1102,9 @@ static int hidp_add_connection(struct input_device *idev) /* Some platforms may choose to require encryption for all devices */ /* Note that this only matters for pre 2.1 devices as otherwise the */ /* device is encrypted by default by the lower layers */ - if (classic_bonded_only || idev->type == BT_UHID_KEYBOARD) { + /* Don't enforce encryption for cable paired devices because they */ + /* don't support it */ + if (!cable_pairing && (classic_bonded_only || idev->type == BT_UHID_KEYBOARD)) { if (!bt_io_set(idev->intr_io, &gerr, BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, BT_IO_OPT_INVALID)) { @@ -1546,6 +1552,16 @@ int input_device_register(struct btd_service *service) btd_service_set_user_data(service, idev); device_set_wake_support(device, true); + if (device_is_cable_pairing(device)) { + struct btd_adapter *adapter = device_get_adapter(device); + const bdaddr_t *adapter_bdaddr = btd_adapter_get_address(adapter); + + DBG("This is a cable paired device, setting the listening input " + "server security level accordingly"); + + server_set_cable_pairing(adapter_bdaddr, true); + } + return 0; } diff --git a/profiles/input/manager.c b/profiles/input/manager.c index d1accc24f..95ca0a7ee 100644 --- a/profiles/input/manager.c +++ b/profiles/input/manager.c @@ -33,7 +33,8 @@ static int hid_server_probe(struct btd_profile *p, struct btd_adapter *adapter) { - return server_start(btd_adapter_get_address(adapter)); + return server_start(btd_adapter_get_address(adapter), + btd_adapter_has_cable_pairing_devices(adapter)); } static void hid_server_remove(struct btd_profile *p, diff --git a/profiles/input/server.c b/profiles/input/server.c index 79cf08a66..e1160d668 100644 --- a/profiles/input/server.c +++ b/profiles/input/server.c @@ -266,12 +266,23 @@ drop: g_io_channel_shutdown(chan, TRUE, NULL); } -int server_start(const bdaddr_t *src) +static BtIOSecLevel get_necessary_sec_level(bool device_cable_pairing) +{ + /* Use lower security to allow the cable paired devices to connect. */ + /* Unless classic bonded only mode is disabled, the security level */ + /* will be bumped again for non cable paired devices in + /* hidp_add_connection() */ + if (device_cable_pairing) + return BT_IO_SEC_LOW; + + return input_get_classic_bonded_only() ? BT_IO_SEC_MEDIUM : BT_IO_SEC_LOW; +} + +int server_start(const bdaddr_t *src, bool device_sixaxis_cable_pairing) { struct input_server *server; GError *err = NULL; - BtIOSecLevel sec_level = input_get_classic_bonded_only() ? - BT_IO_SEC_MEDIUM : BT_IO_SEC_LOW; + const BtIOSecLevel sec_level = get_necessary_sec_level(device_sixaxis_cable_pairing); server = g_new0(struct input_server, 1); bacpy(&server->src, src); @@ -308,6 +319,52 @@ int server_start(const bdaddr_t *src) return 0; } +int server_set_cable_pairing(const bdaddr_t *src, bool device_cable_pairing) +{ + struct input_server *server; + GSList *l; + BtIOSecLevel sec_level; + const BtIOSecLevel new_sec_level = get_necessary_sec_level(device_cable_pairing); + GError *err = NULL; + + l = g_slist_find_custom(servers, src, server_cmp); + if (!l) + return -1; + + server = l->data; + + bt_io_get(server->ctrl, &err, BT_IO_OPT_SEC_LEVEL, &sec_level, + BT_IO_OPT_INVALID); + if (err) { + error("%s", err->message); + g_error_free(err); + return -1; + } + + if (sec_level == new_sec_level) { + DBG("The listening input server is already using the expected security level"); + return -1; + } + + DBG("Applying the new security level to the listening input server"); + + if (!bt_io_set(server->ctrl, &err, BT_IO_OPT_SEC_LEVEL, new_sec_level, + BT_IO_OPT_INVALID)) { + error("bt_io_set(OPT_SEC_LEVEL): %s", err->message); + g_error_free(err); + return -1; + } + + if (!bt_io_set(server->intr, &err, BT_IO_OPT_SEC_LEVEL, new_sec_level, + BT_IO_OPT_INVALID)) { + error("bt_io_set(OPT_SEC_LEVEL): %s", err->message); + g_error_free(err); + return -1; + } + + return 0; +} + void server_stop(const bdaddr_t *src) { struct input_server *server; diff --git a/profiles/input/server.h b/profiles/input/server.h index 50f4b6135..4ad82c10e 100644 --- a/profiles/input/server.h +++ b/profiles/input/server.h @@ -8,5 +8,6 @@ * */ -int server_start(const bdaddr_t *src); +int server_start(const bdaddr_t *src, bool device_cable_pairing); +int server_set_cable_pairing(const bdaddr_t *src, bool device_cable_pairing); void server_stop(const bdaddr_t *src); From patchwork Thu Apr 24 16:02:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ludovico de Nittis X-Patchwork-Id: 885070 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 351E82820B5 for ; Thu, 24 Apr 2025 16:03:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510612; cv=none; b=DK6wmIhs1pnb4AfM8SovGupjm5dF1PXueENdougANsmJ1FWa6wSmUtHbBgN3xy6DTzBUcfzafdtrTNGjN40/4LexDDgHLGYHPKfWG6NW1Fgx1x0OawxWFU4daxsaaJiv5XNbVjURj9TZH3LlPDxg393Myrd5RYE7vsx2HX1azwA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745510612; c=relaxed/simple; bh=2lyiIniWEG0DJoQfeCCzixYYIF3vFCiCN1jEqIf9zeU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ce9z/Ok7oTDTkTH6hk4sXDvk0WG8tNXmxAtT5nycgEJDnmbRsbwrfxCWChVDPc541rMtfyx/iIpNNwpDhQdwrYJ+zfaQYD88R8qN7sS/qc/sX5WknjYVItqxOHMV4pVJ7lYgNOaazjAd3XB1pW5HSmQHpYs9thCSQb2NzT+THjM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=VeF77Coo; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="VeF77Coo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1745510606; bh=2lyiIniWEG0DJoQfeCCzixYYIF3vFCiCN1jEqIf9zeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VeF77CooM46LK3OUKBHDwMCrTFaWf5NRPEpxL/3kxPk5kKi+WPddR8PouR9FPP7Zw +EvrSlcOwFe5JER6GhKwit2PP6MUN3vRNlIbcMQF8sDlgHNKKO+O5eKK5YG8Aevn3w AGuN3vWbG+apVFn0lxYySPZ7+hG9Dza33dhPMPAVxt8WZ2OU1uUM80KfW4b67s/4YV iqO50Ln0XJmXJmCpxrhDj4RgXi6HMcHs98MY03WEe0MqrcCeEAxlrCWuGaPM1WpaxW WFjVOivRfTi8C6xPNgsxVDDNuNY5xOjMHT9T32mQQRFIBzPnMSkXB+jbG2g8U+3YNO at+QQCaYK6kYw== Received: from localhost.localdomain (unknown [81.56.51.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: denittis) by bali.collaboradmins.com (Postfix) with ESMTPSA id 4649F17E36BB; Thu, 24 Apr 2025 18:03:26 +0200 (CEST) From: Ludovico de Nittis To: linux-bluetooth@vger.kernel.org Cc: Ludovico de Nittis Subject: [PATCH BlueZ v4 6/6] sixaxis: Set security level when adding a sixaxis device Date: Thu, 24 Apr 2025 18:02:36 +0200 Message-ID: <20250424160236.179982-7-ludovico.denittis@collabora.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424160236.179982-1-ludovico.denittis@collabora.com> References: <20250424160236.179982-1-ludovico.denittis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When doing the cable pairing for a sixaxis, we may need to change the listening input server security level. This is because sixaxis gamepads can only work with the level BT_IO_SEC_LOW. --- plugins/sixaxis.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c index ea160c65d..1fab8ae59 100644 --- a/plugins/sixaxis.c +++ b/plugins/sixaxis.c @@ -36,6 +36,7 @@ #include "src/plugin.h" #include "src/log.h" #include "src/shared/util.h" +#include "profiles/input/server.h" #include "profiles/input/sixaxis.h" struct authentication_closure { @@ -301,6 +302,8 @@ static void agent_auth_cb(DBusError *derr, void *user_data) SIXAXIS_HID_SDP_RECORD); device_set_cable_pairing(closure->device, true); + + server_set_cable_pairing(adapter_bdaddr, true); } ba2str(&closure->bdaddr, device_addr);