Bluetooth: Fix EIR data generation for mgmt_device_found

The mgmt_device_found function expects to receive only the significant
part of the EIR data so it needs to be removed before calling the
function. This patch adds a new eir_get_length() helper function to
calculate the length of the significant part.

Signed-off-by: Vishal Agarwal <vishal.agarwal@stericsson.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index fac840afd131..9c60e0d8db5f 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -3001,6 +3001,7 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct
         struct inquiry_data data;
         struct extended_inquiry_info *info = (void *) (skb->data + 1);
         int num_rsp = *((__u8 *) skb->data);
+        size_t eir_len;
 
         BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
 
@@ -3033,9 +3034,10 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct
 
                 name_known = hci_inquiry_cache_update(hdev, &data, name_known,
                                                       &ssp);
+                eir_len = eir_get_length(info->data, sizeof(info->data));
                 mgmt_device_found(hdev, &info->bdaddr, ACL_LINK, 0x00,
                                   info->dev_class, info->rssi, !name_known,
-                                  ssp, info->data, sizeof(info->data));
+                                  ssp, info->data, eir_len);
         }
 
         hci_dev_unlock(hdev);