Bluetooth: Update resolving list when updating whitelist
Subsystems (2)
Marcel Holtmann
maintainerPATCH 1/1 Bluetooth: Update resolving list when updating whitelist
When the whitelist is updated, then also update the entries of the resolving list for devices where IRKs are available.
--- net/bluetooth/hci_request.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)
net/bluetooth/hci_request.c +35 -2
@@ -695,6 +695,21 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,bt_dev_dbg (req->hdev,"Remove %pMR (0x%x) from whitelist" , &cp.bdaddr, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_DEL_FROM_WHITE_LIST ,sizeof (cp), &cp); + +if (use_ll_privacy (req->hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (req->hdev, bdaddr, bdaddr_type); +if (irk) { +struct hci_cp_le_del_from_resolv_list cp; + + cp.bdaddr_type = bdaddr_type; +bacpy (&cp.bdaddr, bdaddr); + +hci_req_add (req,HCI_OP_LE_DEL_FROM_RESOLV_LIST , +sizeof (cp), &cp); + } + } }/* Adds connection to white list if needed. On error, returns -1. */
@@ -715,7 +730,7 @@ static int add_to_white_list(struct hci_request *req,return -1 ;/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, ¶ms->addr, params->addr_type)) {return -1 ; }
@@ -732,6 +747,24 @@ static int add_to_white_list(struct hci_request *req, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_ADD_TO_WHITE_LIST ,sizeof (cp), &cp); +if (use_ll_privacy (hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (hdev, ¶ms->addr, + params->addr_type); +if (irk) { +struct hci_cp_le_add_to_resolv_list cp; + + cp.bdaddr_type = params->addr_type; +bacpy (&cp.bdaddr, ¶ms->addr); +memcpy (cp.peer_irk, irk->val,16 ); +memset (cp.local_irk,0 ,16 ); + +hci_req_add (req,HCI_OP_LE_ADD_TO_RESOLV_LIST , +sizeof (cp), &cp); + } + } +return 0 ; }
@@ -772,7 +805,7 @@ static u8 update_white_list(struct hci_request *req) }/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, &b->bdaddr, b->bdaddr_type)) {return 0x00 ; }
Signature · 1 line
2.25.2
Luiz Augusto von Dentz
maintainerHi Marcel,
Quoted 53 lines · Marcel Holtmann
When the whitelist is updated, then also update the entries of the resolving list for devices where IRKs are available.
Signed-off-by Marcel Holtmann <[email protected]>--- net/bluetooth/hci_request.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)net/bluetooth/hci_request.c +21
-1@@ -695,6 +695,21 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,bt_dev_dbg (req->hdev,"Remove %pMR (0x%x) from whitelist" , &cp.bdaddr, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_DEL_FROM_WHITE_LIST ,sizeof (cp), &cp); + +if (use_ll_privacy (req->hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (req->hdev, bdaddr, bdaddr_type); +if (irk) { +struct hci_cp_le_del_from_resolv_list cp; + + cp.bdaddr_type = bdaddr_type; +bacpy (&cp.bdaddr, bdaddr); + +hci_req_add (req,HCI_OP_LE_DEL_FROM_RESOLV_LIST , +sizeof (cp), &cp); + } + } }/* Adds connection to white list if needed. On error, returns -1. */ @@ -715,7 +730,7 @@ static int add_to_white_list(struct hci_request *req,return -1 ;/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, ¶ms->addr, params->addr_type)) {return -1 ; }@@ -732,6 +747,24 @@ static int add_to_white_list(struct hci_request *req, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_ADD_TO_WHITE_LIST ,sizeof (cp), &cp); +if (use_ll_privacy (hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (hdev, ¶ms->addr, + params->addr_type);
net/bluetooth/hci_request.c static int add_to_white_list(struct hci_request *req, · line 764
Quoted 10 lines
net/bluetooth/hci_request.c +10
-0+if (irk) { +struct hci_cp_le_add_to_resolv_list cp; + + cp.bdaddr_type = params->addr_type; +bacpy (&cp.bdaddr, ¶ms->addr); +memcpy (cp.peer_irk, irk->val,16 ); +memset (cp.local_irk,0 ,16 ); + +hci_req_add (req,HCI_OP_LE_ADD_TO_RESOLV_LIST , +sizeof (cp), &cp);
Shouldn't we be checking if there is any space left in the list before trying to send the command? I wonder what would happen if there is too many IRKs, I guess that means we would still have to resolve them in the host.
Quoted 18 lines
net/bluetooth/hci_request.c +4
-2+ } + } +return 0 ; }@@ -772,7 +805,7 @@ static u8 update_white_list(struct hci_request *req) }/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, &b->bdaddr, b->bdaddr_type)) {return 0x00 ; } --2.25.2
Signature · 1 line
Luiz Augusto von Dentz
Marcel Holtmann
maintainerHi Luiz,
Quoted 59 lines
Quoted 59 lines
When the whitelist is updated, then also update the entries of the resolving list for devices where IRKs are available.
Signed-off-by Marcel Holtmann <[email protected]>---
net/bluetooth/hci_request.c| 37 +++++++++++++++++++++++++++++++++++--1 file changed, 35 insertions(+), 2 deletions(-)net/bluetooth/hci_request.c +28
-1@@ -695,6 +695,21 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,bt_dev_dbg (req->hdev,"Remove %pMR (0x%x) from whitelist" , &cp.bdaddr, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_DEL_FROM_WHITE_LIST ,sizeof (cp), &cp); + +if (use_ll_privacy (req->hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (req->hdev, bdaddr, bdaddr_type); +if (irk) { +struct hci_cp_le_del_from_resolv_list cp; + + cp.bdaddr_type = bdaddr_type; +bacpy (&cp.bdaddr, bdaddr); + +hci_req_add (req,HCI_OP_LE_DEL_FROM_RESOLV_LIST , +sizeof (cp), &cp); + } + } }/* Adds connection to white list if needed. On error, returns -1. */ @@ -715,7 +730,7 @@ static int add_to_white_list(struct hci_request *req,return -1 ;/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, ¶ms->addr, params->addr_type)) {return -1 ; }@@ -732,6 +747,24 @@ static int add_to_white_list(struct hci_request *req, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_ADD_TO_WHITE_LIST ,sizeof (cp), &cp); +if (use_ll_privacy (hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (hdev, ¶ms->addr, + params->addr_type); +if (irk) { +struct hci_cp_le_add_to_resolv_list cp; + + cp.bdaddr_type = params->addr_type; +bacpy (&cp.bdaddr, ¶ms->addr); +memcpy (cp.peer_irk, irk->val,16 ); +memset (cp.local_irk,0 ,16 );
Quoted 8 lines
net/bluetooth/hci_request.c static int add_to_white_list(struct hci_request *req, · line 764
Quoted 3 lines
net/bluetooth/hci_request.c +3
-0+ +hci_req_add (req,HCI_OP_LE_ADD_TO_RESOLV_LIST , +sizeof (cp), &cp);Shouldn't we be checking if there is any space left in the list before trying to send the command? I wonder what would happen if there is too many IRKs, I guess that means we would still have to resolve them in the host.
the resolving list size is just a guesstimate and no guarantee that space is available. However my assumption is that if you have x entries for whitespace, then you also get x entries for the resolving list. If we are not putting the device in the whitelist, then it also makes no sense to add it to the resolving list.
Regards
Marcel
Hi Marcel,
Since the resolv list is tied directly to the whitelist, do we still need hdev->le_resolv_list? Maybe we should remove it.
Abhishek
Quoted 81 lines · Marcel Holtmann
When the whitelist is updated, then also update the entries of the resolving list for devices where IRKs are available.
Signed-off-by Marcel Holtmann <[email protected]>--- net/bluetooth/hci_request.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)net/bluetooth/hci_request.c +35
-3@@ -695,6 +695,21 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,bt_dev_dbg (req->hdev,"Remove %pMR (0x%x) from whitelist" , &cp.bdaddr, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_DEL_FROM_WHITE_LIST ,sizeof (cp), &cp); + +if (use_ll_privacy (req->hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (req->hdev, bdaddr, bdaddr_type); +if (irk) { +struct hci_cp_le_del_from_resolv_list cp; + + cp.bdaddr_type = bdaddr_type; +bacpy (&cp.bdaddr, bdaddr); + +hci_req_add (req,HCI_OP_LE_DEL_FROM_RESOLV_LIST , +sizeof (cp), &cp); + } + } }/* Adds connection to white list if needed. On error, returns -1. */ @@ -715,7 +730,7 @@ static int add_to_white_list(struct hci_request *req,return -1 ;/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, ¶ms->addr, params->addr_type)) {return -1 ; }@@ -732,6 +747,24 @@ static int add_to_white_list(struct hci_request *req, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_ADD_TO_WHITE_LIST ,sizeof (cp), &cp); +if (use_ll_privacy (hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (hdev, ¶ms->addr, + params->addr_type); +if (irk) { +struct hci_cp_le_add_to_resolv_list cp; + + cp.bdaddr_type = params->addr_type; +bacpy (&cp.bdaddr, ¶ms->addr); +memcpy (cp.peer_irk, irk->val,16 ); +memset (cp.local_irk,0 ,16 ); + +hci_req_add (req,HCI_OP_LE_ADD_TO_RESOLV_LIST , +sizeof (cp), &cp); + } + } +return 0 ; }@@ -772,7 +805,7 @@ static u8 update_white_list(struct hci_request *req) }/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, &b->bdaddr, b->bdaddr_type)) {return 0x00 ; } --2.25.2
Marcel Holtmann
maintainerHi Abhishek,
Quoted 2 lines
Since the resolv list is tied directly to the whitelist, do we still need
hdev->le_resolv_list? Maybe we should remove it.
it is really useful for debugging since you can look into debugfs to see what is actually programmed into the controller. I also have the feeling that eventually we might need the resolving list when we have privacy enabled.
Regards
Marcel
kbuild test robot
build botI love your patch! Yet something to improve:
Hi Marcel,
I love your patch! Yet something to improve:
[auto build test ERROR on bluetooth-next/master]
[also build test ERROR on next-20200407]
[cannot apply to v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Marcel-Holtmann/Bluetooth-Update-resolving-list-when-updating-whitelist/20200408-045729 base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master config: parisc-allyesconfig (attached as .config) compiler: hppa-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=9.3.0 make.cross ARCH=parisc
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
net/bluetooth/hci_request.c: In function 'del_from_white_list':
>> net/bluetooth/hci_request.c:693:6: error: implicit declaration of function 'use_ll_privacy' [-Werror=implicit-function-declaration]
693 | if (use_ll_privacy(req->hdev)) {
| ^~~~~~~~~~~~~~cc1: some warnings being treated as errors
vim +/use_ll_privacy +693 net/bluetooth/hci_request.c
680
681 static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,
682 u8 bdaddr_type)
683 {
684 struct hci_cp_le_del_from_white_list cp;
685
686 cp.bdaddr_type = bdaddr_type;
687 bacpy(&cp.bdaddr, bdaddr);
688
689 bt_dev_dbg(req->hdev, "Remove %pMR (0x%x) from whitelist", &cp.bdaddr,
690 cp.bdaddr_type);
691 hci_req_add(req, HCI_OP_LE_DEL_FROM_WHITE_LIST, sizeof(cp), &cp);
692
> 693 if (use_ll_privacy(req->hdev)) { 694 struct smp_irk *irk;
695
696 irk = hci_find_irk_by_addr(req->hdev, bdaddr, bdaddr_type);
697 if (irk) {
698 struct hci_cp_le_del_from_resolv_list cp;
699
700 cp.bdaddr_type = bdaddr_type;
701 bacpy(&cp.bdaddr, bdaddr);
702
703 hci_req_add(req, HCI_OP_LE_DEL_FROM_RESOLV_LIST,
704 sizeof(cp), &cp);
705 }
706 }
707 }
708
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Hi Marcel
Quoted 50 lines · Marcel Holtmann
When the whitelist is updated, then also update the entries of the resolving list for devices where IRKs are available.
Signed-off-by Marcel Holtmann <[email protected]>--- net/bluetooth/hci_request.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)net/bluetooth/hci_request.c +18
-1@@ -695,6 +695,21 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,bt_dev_dbg (req->hdev,"Remove %pMR (0x%x) from whitelist" , &cp.bdaddr, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_DEL_FROM_WHITE_LIST ,sizeof (cp), &cp); + +if (use_ll_privacy (req->hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (req->hdev, bdaddr, bdaddr_type); +if (irk) { +struct hci_cp_le_del_from_resolv_list cp; + + cp.bdaddr_type = bdaddr_type; +bacpy (&cp.bdaddr, bdaddr); + +hci_req_add (req,HCI_OP_LE_DEL_FROM_RESOLV_LIST , +sizeof (cp), &cp); + } + } }/* Adds connection to white list if needed. On error, returns -1. */ @@ -715,7 +730,7 @@ static int add_to_white_list(struct hci_request *req,return -1 ;/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, ¶ms->addr, params->addr_type)) {return -1 ; }@@ -732,6 +747,24 @@ static int add_to_white_list(struct hci_request *req, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_ADD_TO_WHITE_LIST ,sizeof (cp), &cp); +if (use_ll_privacy (hdev)) { +struct smp_irk *irk;
net/bluetooth/hci_request.c static int add_to_white_list(struct hci_request *req, · line 761
Quoted 10 lines
net/bluetooth/hci_request.c +10
-0+ + irk =hci_find_irk_by_addr (hdev, ¶ms->addr, + params->addr_type); +if (irk) { +struct hci_cp_le_add_to_resolv_list cp; + + cp.bdaddr_type = params->addr_type; +bacpy (&cp.bdaddr, ¶ms->addr); +memcpy (cp.peer_irk, irk->val,16 ); +memset (cp.local_irk,0 ,16 );
Shall we memcpy hdev->irk as local_irk here.
if privacy (HCI_PRIVACY) is enabled. also if controller supports LL_PRIVACY so that stack can utilize it.
else continue with HCI_PRIVACY.
Is there any drawback with this approach. please guide
Quoted 19 lines
net/bluetooth/hci_request.c +7
-2+ +hci_req_add (req,HCI_OP_LE_ADD_TO_RESOLV_LIST , +sizeof (cp), &cp); + } + } +return 0 ; }@@ -772,7 +805,7 @@ static u8 update_white_list(struct hci_request *req) }/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, &b->bdaddr, b->bdaddr_type)) {return 0x00 ; } --
Quoted 2 lines
2.25.2
Regards
Sathish N
Hi Marcel
Quoted 81 lines · Sathish Narasimman
Hi Marcel
Quoted 50 lines · Marcel Holtmann
When the whitelist is updated, then also update the entries of the resolving list for devices where IRKs are available.
Signed-off-by Marcel Holtmann <[email protected]>--- net/bluetooth/hci_request.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-)net/bluetooth/hci_request.c +18
-1@@ -695,6 +695,21 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,bt_dev_dbg (req->hdev,"Remove %pMR (0x%x) from whitelist" , &cp.bdaddr, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_DEL_FROM_WHITE_LIST ,sizeof (cp), &cp); + +if (use_ll_privacy (req->hdev)) { +struct smp_irk *irk; + + irk =hci_find_irk_by_addr (req->hdev, bdaddr, bdaddr_type); +if (irk) { +struct hci_cp_le_del_from_resolv_list cp; + + cp.bdaddr_type = bdaddr_type; +bacpy (&cp.bdaddr, bdaddr); + +hci_req_add (req,HCI_OP_LE_DEL_FROM_RESOLV_LIST , +sizeof (cp), &cp); + } + } }/* Adds connection to white list if needed. On error, returns -1. */ @@ -715,7 +730,7 @@ static int add_to_white_list(struct hci_request *req,return -1 ;/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, ¶ms->addr, params->addr_type)) {return -1 ; }@@ -732,6 +747,24 @@ static int add_to_white_list(struct hci_request *req, cp.bdaddr_type);hci_req_add (req,HCI_OP_LE_ADD_TO_WHITE_LIST ,sizeof (cp), &cp); +if (use_ll_privacy (hdev)) { +struct smp_irk *irk;net/bluetooth/hci_request.c static int add_to_white_list(struct hci_request *req, · line 761
Quoted 10 lines
net/bluetooth/hci_request.c +10
-0+ + irk =hci_find_irk_by_addr (hdev, ¶ms->addr, + params->addr_type); +if (irk) { +struct hci_cp_le_add_to_resolv_list cp; + + cp.bdaddr_type = params->addr_type; +bacpy (&cp.bdaddr, ¶ms->addr); +memcpy (cp.peer_irk, irk->val,16 ); +memset (cp.local_irk,0 ,16 );Shall we memcpy
hdev->irkaslocal_irkhere.
if privacy (HCI_PRIVACY) is enabled. also if controller supportsLL_PRIVACYso that stack can utilize it.
else continue withHCI_PRIVACY.
Is there any drawback with this approach. please guideQuoted 12 lines
net/bluetooth/hci_request.c +6
-0+ +hci_req_add (req,HCI_OP_LE_ADD_TO_RESOLV_LIST , +sizeof (cp), &cp); + } + } +return 0 ; }@@ -772,7 +805,7 @@ static u8 update_white_list(struct hci_request *req) }
Quoted 9 lines
Quoted 9 lines
net/bluetooth/hci_request.c +1
-2/* White list can not be used with RPAs */ -if (!allow_rpa && +if (!allow_rpa && !use_ll_privacy (hdev) &&hci_find_irk_by_addr (hdev, &b->bdaddr, b->bdaddr_type)) {return 0x00 ; } --2.25.2
I have uploaded patch v2 with a slight modification over your patch. can you please review
Quoted 3 lines
Regards
Sathish N
Regards
Sathish N