Skip to content

Conversation

@trond-snekvik
Copy link
Contributor

@trond-snekvik trond-snekvik commented Feb 10, 2021

As network_decode needs a target buffer for decoding, the max PDU length
must be checked to prevent overflow on the target buffer. When receiving
a proxy configuration message with excessive length, there's no previous
check for this.

Also pulls the NET PDU length defines out into net.h, so they can be
used when defining the target buffers.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
After #31176, the network would get stored immediately in
bt_mesh_net_create, causing the address and devicekey to get stored as
their zero-initialized version, as they're only being set in the
bt_mesh_comp_provision call, which fires after.

Fixes #32067.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
@trond-snekvik
Copy link
Contributor Author

Compliance failures are all on commit title length.

@joerchan
Copy link
Contributor

joerchan commented Feb 10, 2021

Compliance failures are all on commit title length.

EDIT: nvm :P

Copy link
Contributor

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pulls in 3 Bluetooth Mesh bugfix PRs and one controller bugfix PR from upstream:

* [zephyrproject-rtos/zephyr#32069](https://github.com/zephyrproject-rtos/zephyr/pull/32069) (merged upstream)

* [zephyrproject-rtos/zephyr#31909](https://github.com/zephyrproject-rtos/zephyr/pull/31909) (merged upstream)

* [zephyrproject-rtos/zephyr#32080](https://github.com/zephyrproject-rtos/zephyr/pull/32080) (pending upstream)

* [zephyrproject-rtos/zephyr#32160](https://github.com/zephyrproject-rtos/zephyr/pull/32160) (pending upstream)

Note, all PRs mentioned have been merged upstream, so you may change all the commits in this PR to [nrf fromtree]

@tejlmand
Copy link
Contributor

Compliance failures are all on commit title length.

you can still line wrap the title as it is done in other commits.
a7ebc9d

Merging a PR with compliance failure causes all later PRs to fail in same way.
That has happened before.

Copy link
Contributor

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix title length, so we don't end in the situation where all subsequent PRs starts to fail compliance.

cvinayak and others added 3 commits February 11, 2021 09:49
… ...

... initialization

Fix missing advertising PDU length initialization which
prevented advertising PDU to be transmitted by Radio. This
issue was reproduced when connectable undirected advertising
was enabled without setting an advertising data.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
... friend msg

Set app_idx and net_idx in the msg_ctx before calling
bt_mesh_keys_resolve when re-encrypting friend messages, as they'll be
referenced inside the function.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
... friend

Sets the sequence number when re-encrypting messages from the friend to
the lpn.

This is a regression from #28511.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
@trond-snekvik trond-snekvik force-pushed the mesh_downstream_ncs_1_5 branch from a9b0084 to 709aa11 Compare February 11, 2021 08:50
Copy link
Contributor

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Included in #459

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants