From: Ludovico de Nittis <ludovico.denittis@collabora.com>
To: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH BlueZ v2 8/8] input: Validate the Sixaxis HID report descriptor
Date: Thu, 24 Apr 2025 16:37:44 +0200 [thread overview]
Message-ID: <62ec9d1f-b3ff-4f3d-8e10-e43c50e9920f@collabora.com> (raw)
In-Reply-To: <CABBYNZJ4+=zmArfh6bckzH-9z0HwV9besE1xM3OcjZbSh+b=1A@mail.gmail.com>
Hi Luiz,
On 4/23/25 4:56 PM, Luiz Augusto von Dentz wrote:
> Hi Ludovico,
>
> On Wed, Apr 23, 2025 at 10:41 AM Ludovico de Nittis
> <ludovico.denittis@collabora.com> wrote:
>> Given that the Sixaxis devices can't work with encryption, i.e. they
>> only work with BT_IO_SEC_LOW, this makes it harder to notice if the
>> device we are talking to is the expected Sixaxis gamepad or an impostor.
>>
>> To reduce the possible attack surface, we ensure that the report
>> descriptor that the device provided resembles what a real Sixaxis
>> gamepad should have. E.g. it should only have Usages for `Joystick`,
>> `Pointer` etc... and nothing unexpected like `Keyboard`.
>> ---
>> profiles/input/device.c | 71 +++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 71 insertions(+)
>>
>> diff --git a/profiles/input/device.c b/profiles/input/device.c
>> index 9f05757a6..6f538759b 100644
>> --- a/profiles/input/device.c
>> +++ b/profiles/input/device.c
>> @@ -1062,9 +1062,72 @@ static gboolean encrypt_notify(GIOChannel *io, GIOCondition condition,
>> return FALSE;
>> }
>>
>> +static bool validate_sixaxis_rd_data(const uint8_t *rd_data, uint16_t rd_size)
>> +{
>> + uint16_t i;
>> + size_t data_size = 0;
>> +
>> + for (i = 0; i < rd_size; i += 1 + data_size) {
>> + uint8_t b = rd_data[i];
>> +
>> + /* Long items are reserved for future use, HID 1.11 Section 6.2.2.3 */
>> + if (b == 0xFE) {
>> + DBG("The sixaxis HID report descriptor has an unexpected long item");
>> + return false;
>> + }
>> +
>> + /* Extract data following the HID 1.11 Section 6.2.2.2 */
>> + uint8_t bSize = b & 0x03;
>> + uint8_t bType = (b >> 2) & 0x03;
>> + uint8_t bTag = (b >> 4) & 0x0F;
>> + data_size = bSize == 3 ? 4 : bSize;
>> +
>> + if ((i + 1 + data_size) > rd_size)
>> + break;
>> +
>> + const uint8_t *data = &rd_data[i + 1];
>> +
>> + if (bType == 1 && bTag == 0x0 && data_size >= 1) {
>> + /* Usage Page (Generic Desktop) */
>> + if (data_size == 1 && data[0] == 0x01)
>> + continue;
>> +
>> + /* Usage Page (Button) */
>> + if (data_size == 1 && data[0] == 0x09)
>> + continue;
>> +
>> + /* Usage Page (Vendor Defined Page 1) */
>> + if (data_size == 2 && data[0] == 0x00 && data[1] == 0xFF)
>> + continue;
>> +
>> + DBG("The sixaxis HID report descriptor has an unexpected Usage Page: 0x%02X", data[0]);
>> + return false;
>> + }
>> +
>> + if (bType == 2 && bTag == 0x0 && data_size >= 1) {
>> + /* Usage (Joystick) */
>> + if (data_size == 1 && data[0] == 0x04)
>> + continue;
>> +
>> + /* Usage (Pointer) */
>> + if (data_size == 1 && data[0] == 0x01)
>> + continue;
>> +
>> + /* Axis usages, e.g. Usage (X) */
>> + if (data_size == 1 && data[0] >= 0x30 && data[0] <= 0x35)
>> + continue;
>> +
>> + DBG("The sixaxis HID report descriptor has an unexpected Usage: 0x%02X", data[0]);
>> + return false;
>> + }
>> + }
>> + return true;
>> +}
> The code above shall probably be placed in the sixaxis plugin, so it
> checks if all the reports is proper and only then set cable pairing is
> complete, so we don't have to check on every connection.
I was under the wrong impression that a device could update its report
at every connection.
If this only happens at pairing time, then doing the check there is
definitely better.
And actually, in that case, it shouldn't be needed at all for the
sixaxis because apparently
we manually replace it already with `btd_device_set_record()` if we are
in the
`CABLE_PAIRING_SIXAXIS` situation.
I'm gonna follow up with a v3 in a few minutes.
>> static int hidp_add_connection(struct input_device *idev)
>> {
>> struct hidp_connadd_req *req;
>> + bool sixaxis_cable_pairing;
>> GError *gerr = NULL;
>> int err;
>>
>> @@ -1090,6 +1153,14 @@ static int hidp_add_connection(struct input_device *idev)
>>
>> sixaxis_cable_pairing = device_is_sixaxis_cable_pairing(idev->device);
>>
>> + /* The Sixaxis devices must use the security level BT_IO_SEC_LOW to work. */
>> + /* We reduce the attack surface by ensuring that the report descriptor only */
>> + /* contains the expected Usages that a real Sixaxis gamepad has */
>> + if (sixaxis_cable_pairing && !validate_sixaxis_rd_data(req->rd_data, req->rd_size)) {
>> + error("The sixaxis HID SDP record has unexpected entries, rejecting the connection to %s", idev->path);
>> + goto cleanup;
>> + }
>> +
>> /* Make sure the device is bonded if required */
>> if (!sixaxis_cable_pairing && classic_bonded_only && !input_device_bonded(idev)) {
>> error("Rejected connection from !bonded device %s", idev->path);
>> --
>> 2.49.0
>>
>>
>
next prev parent reply other threads:[~2025-04-24 14:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-23 14:40 [PATCH BlueZ v2 0/8] Support Sixaxis gamepad with classic bonded only Ludovico de Nittis
2025-04-23 14:40 ` [PATCH BlueZ v2 1/8] src: Add new SixaxisCablePairing property Ludovico de Nittis
2025-04-23 14:48 ` Luiz Augusto von Dentz
2025-04-23 14:40 ` [PATCH BlueZ v2 2/8] client: Print SixaxisCablePairing value if BlueZ was compiled with sixaxis Ludovico de Nittis
2025-04-23 14:40 ` [PATCH BlueZ v2 3/8] plugins: Set SixaxisCablePairing property when pairing a sixaxis with USB Ludovico de Nittis
2025-04-23 14:40 ` [PATCH BlueZ v2 4/8] adapter: Add btd_adapter_has_sixaxis_cable_pairing() Ludovico de Nittis
2025-04-23 14:40 ` [PATCH BlueZ v2 5/8] input: Automatically use security level low when using a sixaxis device Ludovico de Nittis
2025-04-23 14:40 ` [PATCH BlueZ v2 6/8] adapter: Set server security level in load_devices() Ludovico de Nittis
2025-04-23 14:40 ` [PATCH BlueZ v2 7/8] sixaxis: Set security level when adding a sixaxis device Ludovico de Nittis
2025-04-23 14:40 ` [PATCH BlueZ v2 8/8] input: Validate the Sixaxis HID report descriptor Ludovico de Nittis
2025-04-23 14:56 ` Luiz Augusto von Dentz
2025-04-24 14:37 ` Ludovico de Nittis [this message]
2025-04-24 14:45 ` Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=62ec9d1f-b3ff-4f3d-8e10-e43c50e9920f@collabora.com \
--to=ludovico.denittis@collabora.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.