korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-15 16:24:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

mesh: On node attach, verify element/model composition only

Browse Source 
When attaching an existing node, verify only the "elements" part
of device composition, i.e., skip verification of CID/PID/VID, CRPL
and features.
This commit is contained in:
Inga Stotland 2020-05-08 17:00:21 -07:00 committed by Brian Gix
parent 9139f7b748
commit 82b2d4cf5e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mesh/node.c
View File

@ -1378,7 +1378,7 @@ static bool check_req_node(struct managed_obj_request *req)
{
uint8_t node_comp[MAX_MSG_LEN - 2];
uint8_t attach_comp[MAX_MSG_LEN - 2];
uint16_t offset = 10;
uint16_t node_len = node_generate_comp(req->node, node_comp,
sizeof(node_comp));
@ -1389,12 +1389,10 @@ static bool check_req_node(struct managed_obj_request *req)
uint16_t attach_len = node_generate_comp(req->attach,
attach_comp, sizeof(attach_comp));
/* Ignore feature bits in Composition Compare */
node_comp[8] = 0;
attach_comp[8] = 0;
/* Verify only element/models composition */
if (node_len != attach_len ||
memcmp(node_comp, attach_comp, node_len)) {
memcmp(&node_comp[offset], &attach_comp[offset],
node_len - offset)) {
l_debug("Failed to verify app's composition data");
return false;
}