2023-03-10 01:35:41

by Stotland, Inga

Subject: [PATCH BlueZ] mesh: Fix node when loading from storage

From: Inga Stotland <[email protected]>

This fixes adding mandatory models (config server, remote provisioner)
to a node whose configuration is being loaded from storage:
mesh_model_add() was called with a wrong argument.

Was: mesh_model_add(..., PRIMARY_ELE_IDX, ...);
Correct: mesh_model_add(..., ele->models, ...);
---
mesh/node.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mesh/node.c b/mesh/node.c
index ed3212685..93537c5ba 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -347,6 +347,7 @@ static bool add_elements_from_storage(struct mesh_node *node,
struct mesh_config_node *db_node)
{
const struct l_queue_entry *entry;
+ struct node_element *ele;

entry = l_queue_get_entries(db_node->elements);

@@ -354,14 +355,19 @@ static bool add_elements_from_storage(struct mesh_node *node,
if (!add_element_from_storage(node, entry->data))
return false;

+ ele = l_queue_find(node->elements, match_element_idx,
+ L_UINT_TO_PTR(PRIMARY_ELE_IDX));
+ if (!ele)
+ return false;
+
/* Add configuration server model on the primary element */
- mesh_model_add(node, PRIMARY_ELE_IDX, CONFIG_SRV_MODEL, NULL);
+ mesh_model_add(node, ele->models, CONFIG_SRV_MODEL, NULL);

/* Add remote provisioning models on the primary element */
- mesh_model_add(node, PRIMARY_ELE_IDX, REM_PROV_SRV_MODEL, NULL);
+ mesh_model_add(node, ele->models, REM_PROV_SRV_MODEL, NULL);

if (node->provisioner)
- mesh_model_add(node, PRIMARY_ELE_IDX, REM_PROV_CLI_MODEL, NULL);
+ mesh_model_add(node, ele->models, REM_PROV_CLI_MODEL, NULL);

return true;
}
--
2.39.2

2023-03-10 03:40:08

by bluez.test.bot

Subject: RE: [BlueZ] mesh: Fix node when loading from storage

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=728452

---Test result---

Test Summary:
CheckPatch PASS 0.40 seconds
GitLint PASS 0.27 seconds
BuildEll PASS 26.16 seconds
BluezMake PASS 745.72 seconds
MakeCheck PASS 10.96 seconds
MakeDistcheck PASS 147.51 seconds
CheckValgrind PASS 239.18 seconds
CheckSmatch PASS 319.60 seconds
bluezmakeextell PASS 95.81 seconds
IncrementalBuild PASS 603.73 seconds
ScanBuild PASS 955.19 seconds



---
Regards,
Linux Bluetooth

2023-03-12 19:10:24

by patchwork-bot+bluetooth

Subject: Re: [PATCH BlueZ] mesh: Fix node when loading from storage

Hello:

This patch was applied to bluetooth/bluez.git (master)
by Brian Gix <[email protected]>:

On Thu, 9 Mar 2023 17:35:12 -0800 you wrote:
> From: Inga Stotland <[email protected]>
>
> This fixes adding mandatory models (config server, remote provisioner)
> to a node whose configuration is being loaded from storage:
> mesh_model_add() was called with a wrong argument.
>
> Was: mesh_model_add(..., PRIMARY_ELE_IDX, ...);
> Correct: mesh_model_add(..., ele->models, ...);
>
> [...]

Here is the summary with links:
- [BlueZ] mesh: Fix node when loading from storage
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=40576ac1badf

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html