[PATCH] Bluetooth: HCI: Fix definition of bt_hci_rsp_read_stored_link_key

[PATCH] Bluetooth: HCI: Fix definition of bt_hci_rsp_read_stored_link_key

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

Both max_num_keys and num_key are 2 octects:

BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E
page 1985:

  Max_Num_Keys:
  Size: 2 octets
  Range: 0x0000 to 0xFFFF

  Num_Keys_Read:
  Size: 2 octets
  Range: 0x0000 to 0xFFFF

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
 include/net/bluetooth/hci.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 84db6b275231..5f95de7367d5 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1047,8 +1047,8 @@ struct hci_cp_read_stored_link_key {
 } __packed;
 struct hci_rp_read_stored_link_key {
 	__u8     status;
-	__u8     max_keys;
-	__u8     num_keys;
+	__u16    max_keys;
+	__u16    num_keys;
 } __packed;
 
 #define HCI_OP_DELETE_STORED_LINK_KEY	0x0c12
-- 
2.33.1

Re: [PATCH] Bluetooth: HCI: Fix definition of bt_hci_rsp_read_stored_link_key

[Marcel Holtmann]

Hi Luiz,

> Both max_num_keys and num_key are 2 octects:
> 
> BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E
> page 1985:
> 
>  Max_Num_Keys:
>  Size: 2 octets
>  Range: 0x0000 to 0xFFFF
> 
>  Num_Keys_Read:
>  Size: 2 octets
>  Range: 0x0000 to 0xFFFF
> 
> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> ---
> include/net/bluetooth/hci.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
> index 84db6b275231..5f95de7367d5 100644
> --- a/include/net/bluetooth/hci.h
> +++ b/include/net/bluetooth/hci.h
> @@ -1047,8 +1047,8 @@ struct hci_cp_read_stored_link_key {
> } __packed;
> struct hci_rp_read_stored_link_key {
> 	__u8     status;
> -	__u8     max_keys;
> -	__u8     num_keys;
> +	__u16    max_keys;
> +	__u16    num_keys;
> } __packed;
> 
> #define HCI_OP_DELETE_STORED_LINK_KEY	0x0c12

I have no idea on how this could be wrong all these years. I added this back in 2015 :(

However, you also need to touch the user of it

       if (!rp->status && sent->read_all == 0x01) {
                hdev->stored_max_keys = rp->max_keys;
                hdev->stored_num_keys = rp->num_keys;
       }

Regards

Marcel