2022-01-04 21:00:55

by Luiz Augusto von Dentz

Subject: [RFC] Bluetooth: hci_event: Rework hci_inquiry_result_with_rssi_evt

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

This rework the handling of hci_inquiry_result_with_rssi_evt to not use
a union to represent the different inquiry responses.

Signed-off-by: Luiz Augusto von Dentz <[email protected]>
---
include/net/bluetooth/hci.h | 6 +-----
net/bluetooth/hci_event.c | 19 +++++++++----------
2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index e2b06bb79e2e..35c073d44ec5 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -2233,11 +2233,7 @@ struct inquiry_info_rssi_pscan {
} __packed;
struct hci_ev_inquiry_result_rssi {
__u8 num;
- struct inquiry_info_rssi info[];
-} __packed;
-struct hci_ev_inquiry_result_rssi_pscan {
- __u8 num;
- struct inquiry_info_rssi_pscan info[];
+ __u8 data[];
} __packed;

#define HCI_EV_REMOTE_EXT_FEATURES 0x23
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index f1082b7c0218..fc30f4c03d29 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4507,16 +4507,13 @@ static void hci_pscan_rep_mode_evt(struct hci_dev *hdev, void *data,
static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,
struct sk_buff *skb)
{
- union {
- struct hci_ev_inquiry_result_rssi *res1;
- struct hci_ev_inquiry_result_rssi_pscan *res2;
- } *ev = edata;
+ struct hci_ev_inquiry_result_rssi *ev = edata;
struct inquiry_data data;
int i;

- bt_dev_dbg(hdev, "num_rsp %d", ev->res1->num);
+ bt_dev_dbg(hdev, "num_rsp %d", ev->num);

- if (!ev->res1->num)
+ if (!ev->num)
return;

if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))
@@ -4524,10 +4521,11 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,

hci_dev_lock(hdev);

- if (skb->len == flex_array_size(ev, res2->info, ev->res2->num)) {
+ if (skb->len == array_size(ev->num,
+ sizeof(struct inquiry_info_rssi_pscan))) {
struct inquiry_info_rssi_pscan *info;

- for (i = 0; i < ev->res2->num; i++) {
+ for (i = 0; i < ev->num; i++) {
u32 flags;

info = hci_ev_skb_pull(hdev, skb,
@@ -4554,10 +4552,11 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata,
info->dev_class, info->rssi,
flags, NULL, 0, NULL, 0);
}
- } else if (skb->len == flex_array_size(ev, res1->info, ev->res1->num)) {
+ } else if (skb->len == array_size(ev->num,
+ sizeof(struct inquiry_info_rssi))) {
struct inquiry_info_rssi *info;

- for (i = 0; i < ev->res1->num; i++) {
+ for (i = 0; i < ev->num; i++) {
u32 flags;

info = hci_ev_skb_pull(hdev, skb,
--
2.33.1

2022-01-05 10:26:41

by Soenke Huster

Subject: Re: [RFC] Bluetooth: hci_event: Rework hci_inquiry_result_with_rssi_evt

On 04.01.22 22:00, Luiz Augusto von Dentz wrote:
> From: Luiz Augusto von Dentz <[email protected]>
>
> This rework the handling of hci_inquiry_result_with_rssi_evt to not use
> a union to represent the different inquiry responses.
>
> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
> ---
> include/net/bluetooth/hci.h | 6 +-----
> net/bluetooth/hci_event.c | 19 +++++++++----------
> 2 files changed, 10 insertions(+), 15 deletions(-)

Tested-by: Soenke Huster <[email protected]>