lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <CABBYNZ++1hjeP9r-3Y4j6gPx42-Gk6dNZOYzuRe5bgdz+YHL6g@mail.gmail.com> Date: Tue, 2 May 2023 16:44:48 -0700 From: Luiz Augusto von Dentz <luiz.dentz@...il.com> To: Johan Hovold <johan+linaro@...nel.org> Cc: Marcel Holtmann <marcel@...tmann.org>, Johan Hedberg <johan.hedberg@...il.com>, Matthias Kaehlcke <mka@...omium.org>, "David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, linux-bluetooth@...r.kernel.org, linux-kernel@...r.kernel.org, netdev@...r.kernel.org Subject: Re: [PATCH 1/2] Bluetooth: fix invalid-bdaddr quirk for non-persistent setup Hi Johan, On Mon, Apr 24, 2023 at 6:35 AM Johan Hovold <johan+linaro@...nel.org> wrote: > > Devices that lack persistent storage for the device address can indicate > this by setting the HCI_QUIRK_INVALID_BDADDR which causes the controller > to be marked as unconfigured until user space has set a valid address. > > Once configured, the device address must be set on every setup for > controllers with HCI_QUIRK_NON_PERSISTENT_SETUP to avoid marking the > controller as unconfigured and requiring the address to be set again. > > Fixes: 740011cfe948 ("Bluetooth: Add new quirk for non-persistent setup settings") > Signed-off-by: Johan Hovold <johan+linaro@...nel.org> > --- > net/bluetooth/hci_sync.c | 28 +++++++++++----------------- > 1 file changed, 11 insertions(+), 17 deletions(-) > > diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c > index a8785126df75..f45598b5a532 100644 > --- a/net/bluetooth/hci_sync.c > +++ b/net/bluetooth/hci_sync.c > @@ -4573,23 +4573,17 @@ static int hci_dev_setup_sync(struct hci_dev *hdev) > invalid_bdaddr = test_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks); > > if (!ret) { > - if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) { > - if (!bacmp(&hdev->public_addr, BDADDR_ANY)) > - hci_dev_get_bd_addr_from_property(hdev); > - > - if (bacmp(&hdev->public_addr, BDADDR_ANY) && > - hdev->set_bdaddr) { > - ret = hdev->set_bdaddr(hdev, > - &hdev->public_addr); > - > - /* If setting of the BD_ADDR from the device > - * property succeeds, then treat the address > - * as valid even if the invalid BD_ADDR > - * quirk indicates otherwise. > - */ > - if (!ret) > - invalid_bdaddr = false; > - } > + if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) && > + !bacmp(&hdev->public_addr, BDADDR_ANY)) > + hci_dev_get_bd_addr_from_property(hdev); > + > + if ((invalid_bdaddr || > + test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks)) && > + bacmp(&hdev->public_addr, BDADDR_ANY) && > + hdev->set_bdaddr) { > + ret = hdev->set_bdaddr(hdev, &hdev->public_addr); > + if (!ret) > + invalid_bdaddr = false; I'd keep the original comments since it appears you haven't changed its logic with respect to invalid_bdaddr. > } > } > > -- > 2.39.2 > -- Luiz Augusto von Dentz
Powered by blists - more mailing lists