Bluetooth: Fix missing PDU length checks for SMP
Subsystems (2)
PATCH 1/9 Bluetooth: Fix missing PDU length checks for SMP
From: Johan Hedberg <[email protected]>
For each received SMP PDU we need to check that we have enough data to fit the specified size of the PDU. This patch adds the necessary checks for each SMP PDU handler and ensures that buffer overflows do not occur if to little data has been received.
--- net/bluetooth/smp.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
net/bluetooth/smp.c +25 -0
@@ -565,6 +565,9 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)BT_DBG ("conn %p" , conn); +if (skb->len <sizeof (*req)) +return SMP_UNSPECIFIED ; +if (conn->hcon->link_mode &HCI_LM_MASTER )return SMP_CMD_NOTSUPP ;
@@ -617,6 +620,9 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)BT_DBG ("conn %p" , conn); +if (skb->len <sizeof (*rsp)) +return SMP_UNSPECIFIED ; +if (!(conn->hcon->link_mode &HCI_LM_MASTER ))return SMP_CMD_NOTSUPP ;
@@ -661,6 +667,9 @@ static u8 smp_cmd_pairing_confirm(struct l2cap_conn *conn, struct sk_buff *skb)BT_DBG ("conn %p %s" , conn, conn->hcon->out ?"master" :"slave" ); +if (skb->len <sizeof (smp->pcnf)) +return SMP_UNSPECIFIED ; +memcpy (smp->pcnf, skb->data,sizeof (smp->pcnf));skb_pull (skb,sizeof (smp->pcnf));
@@ -686,6 +695,9 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)BT_DBG ("conn %p" , conn); +if (skb->len <sizeof (smp->rrnd)) +return SMP_UNSPECIFIED ; +swap128 (skb->data, smp->rrnd);skb_pull (skb,sizeof (smp->rrnd));
@@ -725,6 +737,9 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)BT_DBG ("conn %p" , conn); +if (skb->len <sizeof (*rp)) +return SMP_UNSPECIFIED ; +if (!(conn->hcon->link_mode &HCI_LM_MASTER ))return SMP_CMD_NOTSUPP ;
@@ -814,6 +829,11 @@ static int smp_cmd_encrypt_info(struct l2cap_conn *conn, struct sk_buff *skb)struct smp_cmd_encrypt_info *rp = (void *) skb->data;struct smp_chan *smp = conn->smp_chan; +BT_DBG ("conn %p" , conn); + +if (skb->len <sizeof (*rp)) +return SMP_UNSPECIFIED ; +skb_pull (skb,sizeof (*rp));memcpy (smp->tk, rp->ltk,sizeof (smp->tk));
@@ -829,6 +849,11 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)struct hci_conn *hcon = conn->hcon;u8 authenticated; +BT_DBG ("conn %p" , conn); + +if (skb->len <sizeof (*rp)) +return SMP_UNSPECIFIED ; +skb_pull (skb,sizeof (*rp));hci_dev_lock (hdev);
Signature · 1 line
1.8.5.3
PATCH 2/9 Bluetooth: Fix minor whitespace issues in SMP code
From: Johan Hedberg <[email protected]>
This patch fixes a couple of unnecessary empty lines in the SMP code.
--- net/bluetooth/smp.c | 1 - net/bluetooth/smp.h | 1 - 2 files changed, 2 deletions(-)
net/bluetooth/smp.c +0 -1
@@ -990,7 +990,6 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force) *keydist &= req->resp_key_dist; } -BT_DBG ("keydist 0x%x" , *keydist);if (*keydist &SMP_DIST_ENC_KEY ) {
net/bluetooth/smp.h +0 -1
@@ -132,7 +132,6 @@ struct smp_chan {struct crypto_blkcipher *tfm;struct work_struct confirm;struct work_struct random; - };/* SMP Commands */
Signature · 1 line
1.8.5.3
PATCH 3/9 Bluetooth: Add smp_irk_matches helper function
In reply to [email protected]From: Johan Hedberg <[email protected]>
This patch adds a helper function to check whether a given IRK matches a given Resolvable Private Address (RPA). The function will be needed for implementing the rest of address resolving support.
--- net/bluetooth/smp.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ net/bluetooth/smp.h | 3 +++ 2 files changed, 49 insertions(+)
net/bluetooth/smp.c +46 -0
@@ -78,6 +78,52 @@ static int smp_e(struct crypto_blkcipher *tfm, const u8 *k, u8 *r)return err; } +static int smp_ah (struct crypto_blkcipher *tfm,u8 irk[16 ],u8 r[3 ],u8 res[3 ]) +{ +u8 _res[16 ], k[16 ]; +int err; + +/* r' = padding || r */ +memset (_res,0 ,13 ); + _res[13 ] = r[2 ]; + _res[14 ] = r[1 ]; + _res[15 ] = r[0 ]; + +swap128 (irk, k); + err =smp_e (tfm, k, _res); +if (err) { +BT_ERR ("Encrypt error" ); +return err; + } + +/* The output of the random address function ah is: +* ah(h, r) = e(k, r') mod 2^24 +* The output of the security function e is then truncated to 24 bits +* by taking the least significant 24 bits of the output of e as the +* result of ah. +*/ + res[0 ] = _res[15 ]; + res[1 ] = _res[14 ]; + res[2 ] = _res[13 ]; + +return 0 ; +} + +bool smp_irk_matches (struct crypto_blkcipher *tfm,u8 irk[16 ], +bdaddr_t *bdaddr) +{ +u8 hash[3 ]; +int err; + +BT_DBG ("RPA %pMR IRK %*phN" , bdaddr,16 , irk); + + err =smp_ah (tfm, irk, &bdaddr->b[3 ], hash); +if (err) +return false; + +return !memcmp (bdaddr->b, hash,3 ); +} +static int smp_c1 (struct crypto_blkcipher *tfm,u8 k[16 ],u8 r[16 ],u8 preq[7 ],u8 pres[7 ],u8 _iat,bdaddr_t *ia,u8 _rat,bdaddr_t *ra,u8 res[16 ])
net/bluetooth/smp.h +3 -0
@@ -143,4 +143,7 @@ int smp_user_confirm_reply(struct hci_conn *conn, u16 mgmt_op, __le32 passkey);void smp_chan_destroy (struct l2cap_conn *conn); +bool smp_irk_matches (struct crypto_blkcipher *tfm,u8 irk[16 ], +bdaddr_t *bdaddr); +#endif /* __SMP_H */
Signature · 1 line
1.8.5.3
PATCH 4/9 Bluetooth: Add AES crypto context for each HCI device
In reply to [email protected]From: Johan Hedberg <[email protected]>
Previously the crypto context has only been available for LE SMP sessions, but now that we'll need to perform operations also during discovery it makes sense to have this context part of the hci_dev struct. Later, the context can be removed from the SMP context.
--- include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
include/net/bluetooth/hci_core.h +1 -0
@@ -259,6 +259,7 @@ struct hci_dev {__u32 req_status;__u32 req_result; +struct crypto_blkcipher *tfm_aes;struct discovery_state discovery;struct hci_conn_hash conn_hash;
net/bluetooth/hci_core.c +14 -1
@@ -29,6 +29,7 @@#include <linux/idr.h> #include <linux/rfkill.h> #include <linux/debugfs.h> +#include <linux/crypto.h> #include <asm/unaligned.h> #include <net/bluetooth/bluetooth.h>
@@ -3205,9 +3206,16 @@ int hci_register_dev(struct hci_dev *hdev)dev_set_name (&hdev->dev,"%s" , hdev->name); + hdev->tfm_aes =crypto_alloc_blkcipher ("ecb(aes)" ,0 , +CRYPTO_ALG_ASYNC ); +if (IS_ERR (hdev->tfm_aes)) { +BT_ERR ("Unable to create crypto context" ); + goto err_wqueue; + } + error =device_add (&hdev->dev);if (error <0 ) - goto err_wqueue; + goto err_tfm; hdev->rfkill = rfkill_alloc(hdev->name, &hdev->dev, RFKILL_TYPE_BLUETOOTH, &hci_rfkill_ops,
@@ -3243,6 +3251,8 @@ int hci_register_dev(struct hci_dev *hdev)return id; +err_tfm: +crypto_free_blkcipher (hdev->tfm_aes); err_wqueue:destroy_workqueue (hdev->workqueue);destroy_workqueue (hdev->req_workqueue);
@@ -3293,6 +3303,9 @@ void hci_unregister_dev(struct hci_dev *hdev)rfkill_destroy (hdev->rfkill); } +if (hdev->tfm_aes) +crypto_free_blkcipher (hdev->tfm_aes); +device_del (&hdev->dev);debugfs_remove_recursive (hdev->debugfs);
Signature · 1 line
1.8.5.3
PATCH v2 1/1 Bluetooth: Add AES crypto context for each HCI device
From: Johan Hedberg <[email protected]>
Previously the crypto context has only been available for LE SMP sessions, but now that we'll need to perform operations also during discovery it makes sense to have this context part of the hci_dev struct. Later, the context can be removed from the SMP context.
---
v2: Properly initialize "error" if crypto init fails
include/net/bluetooth/hci_core.h | 1 + net/bluetooth/hci_core.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)
include/net/bluetooth/hci_core.h +1 -0
@@ -259,6 +259,7 @@ struct hci_dev {__u32 req_status;__u32 req_result; +struct crypto_blkcipher *tfm_aes;struct discovery_state discovery;struct hci_conn_hash conn_hash;
net/bluetooth/hci_core.c +16 -1
@@ -29,6 +29,7 @@#include <linux/idr.h> #include <linux/rfkill.h> #include <linux/debugfs.h> +#include <linux/crypto.h> #include <asm/unaligned.h> #include <net/bluetooth/bluetooth.h>
@@ -3205,9 +3206,18 @@ int hci_register_dev(struct hci_dev *hdev)dev_set_name (&hdev->dev,"%s" , hdev->name); + hdev->tfm_aes =crypto_alloc_blkcipher ("ecb(aes)" ,0 , +CRYPTO_ALG_ASYNC ); +if (IS_ERR (hdev->tfm_aes)) { +BT_ERR ("Unable to create crypto context" ); + error =PTR_ERR (hdev->tfm_aes); + hdev->tfm_aes =NULL ; + goto err_wqueue; + } + error =device_add (&hdev->dev);if (error <0 ) - goto err_wqueue; + goto err_tfm; hdev->rfkill = rfkill_alloc(hdev->name, &hdev->dev, RFKILL_TYPE_BLUETOOTH, &hci_rfkill_ops,
@@ -3243,6 +3253,8 @@ int hci_register_dev(struct hci_dev *hdev)return id; +err_tfm: +crypto_free_blkcipher (hdev->tfm_aes); err_wqueue:destroy_workqueue (hdev->workqueue);destroy_workqueue (hdev->req_workqueue);
@@ -3293,6 +3305,9 @@ void hci_unregister_dev(struct hci_dev *hdev)rfkill_destroy (hdev->rfkill); } +if (hdev->tfm_aes) +crypto_free_blkcipher (hdev->tfm_aes); +device_del (&hdev->dev);debugfs_remove_recursive (hdev->debugfs);
Signature · 1 line
1.8.5.3
Marcel Holtmann
maintainerRe: [PATCH v2] Bluetooth: Add AES crypto context for each HCI device
Hi Johan,
Quoted 5 lines
Previously the crypto context has only been available for LE SMP sessions, but now that we'll need to perform operations also during discovery it makes sense to have this context part of the
hci_devstruct. Later, the context can be removed from the SMP context.
Quoted 7 lines
Signed-off-by Johan Hedberg <[email protected]>---
v2: Properly initialize "error" if crypto init fails
include/net/bluetooth/hci_core.h| 1 +net/bluetooth/hci_core.c| 17 ++++++++++++++++-2 files changed, 17 insertions(+), 1 deletion(-)
all 9 patches have been applied to bluetooth-next tree.
Regards
Marcel
PATCH 5/9 Bluetooth: Add basic IRK management support
In reply to [email protected]From: Johan Hedberg <[email protected]>
This patch adds the initial IRK storage and management functions to the HCI core. This includes storing a list of IRKs per HCI device and the ability to add, remove and lookup entries in that list.
--- include/net/bluetooth/hci_core.h | 16 +++++++++ net/bluetooth/hci_core.c | 70 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+)
include/net/bluetooth/hci_core.h +16 -0
@@ -103,6 +103,14 @@ struct smp_ltk {u8 val[16 ]; }; +struct smp_irk { +struct list_head list; +bdaddr_t rpa; +bdaddr_t bdaddr; +u8 addr_type; +u8 val[16 ]; +}; +struct link_key {struct list_head list;bdaddr_t bdaddr;
@@ -269,6 +277,7 @@ struct hci_dev {struct list_head uuids;struct list_head link_keys;struct list_head long_term_keys; +struct list_head identity_resolving_keys;struct list_head remote_oob_data;struct list_head le_conn_params;
@@ -787,6 +796,13 @@ int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr);int hci_smp_ltks_clear (struct hci_dev *hdev);int hci_remove_link_key (struct hci_dev *hdev,bdaddr_t *bdaddr); +struct smp_irk *hci_find_irk_by_rpa (struct hci_dev *hdev,bdaddr_t *rpa); +struct smp_irk *hci_find_irk_by_addr (struct hci_dev *hdev,bdaddr_t *bdaddr, +u8 addr_type); +int hci_add_irk (struct hci_dev *hdev,bdaddr_t *bdaddr,u8 addr_type, +u8 val[16 ],bdaddr_t *rpa); +void hci_smp_irks_clear (struct hci_dev *hdev); +int hci_remote_oob_data_clear (struct hci_dev *hdev);struct oob_data *hci_find_remote_oob_data (struct hci_dev *hdev,bdaddr_t *bdaddr);
net/bluetooth/hci_core.c +70 -0
106 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH 6/9 Bluetooth: Add hci_bdaddr_is_rpa convenience function
In reply to [email protected]From: Johan Hedberg <[email protected]>
When implementing support for Resolvable Private Addresses (RPAs) we'll need to in several places be able to identify such addresses. This patch adds a simple convenience function to do the identification of the address type.
--- include/net/bluetooth/hci_core.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/net/bluetooth/hci_core.h +11 -0
@@ -1071,6 +1071,17 @@ static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type)return false; } +static inline bool hci_bdaddr_is_rpa (bdaddr_t *bdaddr,u8 addr_type) +{ +if (addr_type !=0x01 ) +return false; + +if ((bdaddr->b[5 ] &0xc0 ) ==0x40 ) +return true; + +return false; +} +int hci_register_cb (struct hci_cb *hcb);int hci_unregister_cb (struct hci_cb *hcb);
Signature · 1 line
1.8.5.3
PATCH 7/9 Bluetooth: Implement mgmt_load_irks command
In reply to [email protected]From: Johan Hedberg <[email protected]>
This patch implements the Load IRKs command for the management interface. The command is used to load the kernel with the initial set of IRKs. It also sets a HCI_RPA_RESOLVING flag to indicate that we can start requesting devices to distribute their IRK to us.
--- include/net/bluetooth/hci.h | 1 + include/net/bluetooth/mgmt.h | 12 +++++++ net/bluetooth/mgmt.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+)
include/net/bluetooth/hci.h +1 -0
@@ -125,6 +125,7 @@ enum {HCI_SSP_ENABLED ,HCI_SC_ENABLED ,HCI_SC_ONLY , +HCI_RPA_RESOLVING ,HCI_HS_ENABLED ,HCI_LE_ENABLED , HCI_ADVERTISING,
include/net/bluetooth/mgmt.h +12 -0
@@ -389,6 +389,18 @@ struct mgmt_cp_set_scan_params {#define MGMT_OP_SET_DEBUG_KEYS 0x002E +struct mgmt_irk_info { +struct mgmt_addr_info addr; +__u8 val[16 ]; +} __packed; + +#define MGMT_OP_LOAD_IRKS 0x0030 +struct mgmt_cp_load_irks { +__le16 irk_count; +struct mgmt_irk_info irks[0 ]; +} __packed; +#define MGMT_LOAD_IRKS_SIZE 2 +#define MGMT_EV_CMD_COMPLETE 0x0001struct mgmt_ev_cmd_complete {__le16 opcode;
net/bluetooth/mgmt.c +79 -0
97 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH 8/9 Bluetooth: Enable support for remote IRK distribution
In reply to [email protected]From: Johan Hedberg <[email protected]>
This patch does the necessary changes to request the remote device to distribute its IRK to us during the SMP pairing procedure. This includes setting the right key distribution values in the pairing request/response and handling of the two related SMP PDUs, i.e. Identity Information and Identity Address Information.
--- net/bluetooth/smp.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++----- net/bluetooth/smp.h | 4 +++ 2 files changed, 77 insertions(+), 7 deletions(-)
net/bluetooth/smp.c +73 -7
@@ -249,31 +249,42 @@ static void build_pairing_cmd(struct l2cap_conn *conn,struct smp_cmd_pairing *req, struct smp_cmd_pairing *rsp, __u8 authreq) { - u8 dist_keys = 0; + struct smp_chan *smp = conn->smp_chan; +struct hci_conn *hcon = conn->hcon; +struct hci_dev *hdev = hcon->hdev; +u8 local_dist =0 , remote_dist =0 ;if (test_bit (HCI_PAIRABLE , &conn->hcon->hdev->dev_flags)) { - dist_keys =SMP_DIST_ENC_KEY ; + local_dist =SMP_DIST_ENC_KEY ; + remote_dist =SMP_DIST_ENC_KEY ; authreq |=SMP_AUTH_BONDING ; }else { authreq &= ~SMP_AUTH_BONDING ; } +if (test_bit (HCI_RPA_RESOLVING , &hdev->dev_flags)) + remote_dist |=SMP_DIST_ID_KEY ; +if (rsp ==NULL ) { req->io_capability = conn->hcon->io_capability; req->oob_flag =SMP_OOB_NOT_PRESENT ; req->max_key_size =SMP_MAX_ENC_KEY_SIZE ; - req->init_key_dist = dist_keys; - req->resp_key_dist = dist_keys; + req->init_key_dist = local_dist; + req->resp_key_dist = remote_dist; req->auth_req = (authreq &AUTH_REQ_MASK ); + + smp->remote_key_dist = remote_dist;return ; } rsp->io_capability = conn->hcon->io_capability; rsp->oob_flag =SMP_OOB_NOT_PRESENT ; rsp->max_key_size =SMP_MAX_ENC_KEY_SIZE ; - rsp->init_key_dist = req->init_key_dist & dist_keys; - rsp->resp_key_dist = req->resp_key_dist & dist_keys; + rsp->init_key_dist = req->init_key_dist & remote_dist; + rsp->resp_key_dist = req->resp_key_dist & local_dist; rsp->auth_req = (authreq &AUTH_REQ_MASK ); + + smp->remote_key_dist = rsp->init_key_dist; }static u8 check_enc_key_size (struct l2cap_conn *conn,__u8 max_key_size)
@@ -907,12 +918,61 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)hci_add_ltk (hdev, &hcon->dst, hcon->dst_type,HCI_SMP_LTK ,1 , authenticated, smp->tk, smp->enc_key_size, rp->ediv, rp->rand); -smp_distribute_keys (conn,1 ); +if (!(smp->remote_key_dist &SMP_DIST_ID_KEY )) +smp_distribute_keys (conn,1 );hci_dev_unlock (hdev);return 0 ; } +static int smp_cmd_ident_info (struct l2cap_conn *conn,struct sk_buff *skb) +{ +struct smp_cmd_ident_info *info = (void *) skb->data; +struct smp_chan *smp = conn->smp_chan; + +BT_DBG ("" ); + +if (skb->len <sizeof (*info)) +return SMP_UNSPECIFIED ; + +skb_pull (skb,sizeof (*info)); + +memcpy (smp->irk, info->irk,16 ); + +return 0 ; +} + +static int smp_cmd_ident_addr_info (struct l2cap_conn *conn, +struct sk_buff *skb) +{ +struct smp_cmd_ident_addr_info *info = (void *) skb->data; +struct smp_chan *smp = conn->smp_chan; +struct hci_conn *hcon = conn->hcon; +bdaddr_t rpa; + +BT_DBG ("" ); + +if (skb->len <sizeof (*info)) +return SMP_UNSPECIFIED ; + +skb_pull (skb,sizeof (*info)); + +bacpy (&smp->id_addr, &info->bdaddr); + smp->id_addr_type = info->addr_type; + +if (hci_bdaddr_is_rpa (&hcon->dst, hcon->dst_type)) +bacpy (&rpa, &hcon->dst); +else +bacpy (&rpa,BDADDR_ANY ); + +hci_add_irk (conn->hcon->hdev, &smp->id_addr, smp->id_addr_type, + smp->irk, &rpa); + +smp_distribute_keys (conn,1 ); + +return 0 ; +} +int smp_sig_channel (struct l2cap_conn *conn,struct sk_buff *skb) {struct hci_conn *hcon = conn->hcon;
@@ -987,7 +1047,13 @@ int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb)break ;case SMP_CMD_IDENT_INFO : + reason =smp_cmd_ident_info (conn, skb); +break ; +case SMP_CMD_IDENT_ADDR_INFO : + reason =smp_cmd_ident_addr_info (conn, skb); +break ; +case SMP_CMD_SIGN_INFO :/* Just ignored */ reason =0 ;
net/bluetooth/smp.h +4 -0
@@ -128,6 +128,10 @@ struct smp_chan {u8 pcnf[16 ];/* SMP Pairing Confirm */ u8 tk[16 ];/* SMP Temporary Key */ u8 enc_key_size; +u8 remote_key_dist; +bdaddr_t id_addr; +u8 id_addr_type; +u8 irk[16 ];unsigned long smp_flags;struct crypto_blkcipher *tfm;struct work_struct confirm;
Signature · 1 line
1.8.5.3
PATCH 9/9 Bluetooth: Fix properly ignoring unexpected SMP PDUs
In reply to [email protected]From: Johan Hedberg <[email protected]>
If we didn't request certain pieces of information during the key distribution negotiation we should properly ignore those PDUs if the peer incorrectly sends them. This includes the Encryption Information and Master Identification PDUs if the EncKey bit was not set, and the Identity Information and Identity Address Information PDUs if the IdKey bit was not set.
--- net/bluetooth/smp.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
net/bluetooth/smp.c +16 -0
@@ -891,6 +891,10 @@ static int smp_cmd_encrypt_info(struct l2cap_conn *conn, struct sk_buff *skb)if (skb->len <sizeof (*rp))return SMP_UNSPECIFIED ; +/* Ignore this PDU if it wasn't requested */ +if (!(smp->remote_key_dist &SMP_DIST_ENC_KEY )) +return 0 ; +skb_pull (skb,sizeof (*rp));memcpy (smp->tk, rp->ltk,sizeof (smp->tk));
@@ -911,6 +915,10 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)if (skb->len <sizeof (*rp))return SMP_UNSPECIFIED ; +/* Ignore this PDU if it wasn't requested */ +if (!(smp->remote_key_dist &SMP_DIST_ENC_KEY )) +return 0 ; +skb_pull (skb,sizeof (*rp));hci_dev_lock (hdev);
@@ -935,6 +943,10 @@ static int smp_cmd_ident_info(struct l2cap_conn *conn, struct sk_buff *skb)if (skb->len <sizeof (*info))return SMP_UNSPECIFIED ; +/* Ignore this PDU if it wasn't requested */ +if (!(smp->remote_key_dist &SMP_DIST_ID_KEY )) +return 0 ; +skb_pull (skb,sizeof (*info));memcpy (smp->irk, info->irk,16 );
@@ -955,6 +967,10 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,if (skb->len <sizeof (*info))return SMP_UNSPECIFIED ; +/* Ignore this PDU if it wasn't requested */ +if (!(smp->remote_key_dist &SMP_DIST_ID_KEY )) +return 0 ; +skb_pull (skb,sizeof (*info));bacpy (&smp->id_addr, &info->bdaddr);
Signature · 1 line
1.8.5.3