2021-07-09 23:44:20

by Luiz Augusto von Dentz

Subject: [PATCH BlueZ] btdev: Add proper checks for own_addr_type for extended advertising

From: Luiz Augusto von Dentz <[email protected]>

own_addr_type 0x01 and 0x03 shall check that a random address has
properly been set and in case of 0x03 the resolving list actually
contains the irk of the identity address:

BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 4, Part E
page 2596

'If the advertising set's Own_Address_Type parameter is set to 0x01
and the random address for the advertising set has not been
initialized, the Controller shall return the error code Invalid HCI
Command Parameters (0x12).'

BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 4, Part E
page 2597

'If the advertising set's Own_Address_Type parameter is set to 0x03,
the controller's resolving list did not contain a matching entry, and
the random address for the advertising set has not been initialized,
the Controller shall return the error code Invalid HCI Command
Parameters (0x12).'
---
emulator/btdev.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)

diff --git a/emulator/btdev.c b/emulator/btdev.c
index 1567713d2..f1c3a0a84 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -4538,6 +4538,20 @@ static bool ext_adv_timeout(void *user_data)
return false;
}

+static struct btdev_rl *rl_find(struct btdev *dev, uint8_t type, uint8_t *addr)
+{
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(dev->le_rl); i++) {
+ struct btdev_rl *rl = &dev->le_rl[i];
+
+ if (RL_ADDR_EQUAL(rl, type, addr))
+ return rl;
+ }
+
+ return NULL;
+}
+
static int cmd_set_ext_adv_enable(struct btdev *dev, const void *data,
uint8_t len)
{
@@ -4576,6 +4590,37 @@ static int cmd_set_ext_adv_enable(struct btdev *dev, const void *data,
goto exit_complete;
}

+ if ((ext_adv->own_addr_type == 0x01 ||
+ ext_adv->own_addr_type == 0x03)) {
+ uint8_t none[6];
+
+ memset(none, 0, sizeof(none));
+
+ /* If the advertising set's Own_Address_Type parameter
+ * is set to 0x01 (or 0x03) and the random address for
+ * the advertising set has not been initialized, the
+ * Controller shall return the error code Invalid HCI
+ * Command Parameters (0x12).
+ */
+ if (!memcmp(ext_adv->random_addr, none, sizeof(none))) {
+ status = BT_HCI_ERR_INVALID_PARAMETERS;
+ goto exit_complete;
+ }
+
+ /* If the advertising set's Own_Address_Type parameter
+ * is set to 0x03, the controller's resolving list did
+ * not contain a matching entry, the Controller shall
+ * return the error code Invalid HCI Command
+ * Parameters (0x12).
+ */
+ if (ext_adv->own_addr_type == 0x03 &&
+ !rl_find(dev, ext_adv->direct_addr_type,
+ ext_adv->direct_addr)) {
+ status = BT_HCI_ERR_INVALID_PARAMETERS;
+ goto exit_complete;
+ }
+ }
+
ext_adv->enable = cmd->enable;

if (!cmd->enable)
--
2.31.1

2021-07-10 01:23:02

by bluez.test.bot

Subject: RE: [BlueZ] btdev: Add proper checks for own_addr_type for extended advertising

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=513329

---Test result---

Test Summary:
CheckPatch PASS 0.40 seconds
GitLint PASS 0.11 seconds
Prep - Setup ELL PASS 39.78 seconds
Build - Prep PASS 0.12 seconds
Build - Configure PASS 7.10 seconds
Build - Make PASS 173.15 seconds
Make Check PASS 8.93 seconds
Make Distcheck PASS 204.79 seconds
Build w/ext ELL - Configure PASS 6.93 seconds
Build w/ext ELL - Make PASS 165.87 seconds

Details
##############################
Test: CheckPatch - PASS
Desc: Run checkpatch.pl script with rule in .checkpatch.conf

##############################
Test: GitLint - PASS
Desc: Run gitlint with rule in .gitlint

##############################
Test: Prep - Setup ELL - PASS
Desc: Clone, build, and install ELL

##############################
Test: Build - Prep - PASS
Desc: Prepare environment for build

##############################
Test: Build - Configure - PASS
Desc: Configure the BlueZ source tree

##############################
Test: Build - Make - PASS
Desc: Build the BlueZ source tree

##############################
Test: Make Check - PASS
Desc: Run 'make check'

##############################
Test: Make Distcheck - PASS
Desc: Run distcheck to check the distribution

##############################
Test: Build w/ext ELL - Configure - PASS
Desc: Configure BlueZ source with '--enable-external-ell' configuration

##############################
Test: Build w/ext ELL - Make - PASS
Desc: Build BlueZ source with '--enable-external-ell' configuration



---
Regards,
Linux Bluetooth