Skip to content

Conversation

otavio
Copy link
Contributor

@otavio otavio commented Apr 3, 2020

This backport the fixes made in #23885.

fixes #24211

nandojve and others added 6 commits April 3, 2020 08:59
Fix all build warnings.

Signed-off-by: Gerson Fernando Budke <[email protected]>
Signed-off-by: Otavio Salvador <[email protected]>
(cherry picked from commit 92f9cd9)
The MAX_PAYLOAD_SIZE must reflect the size of COAP_BLOCK_x. This is
necessary becase BLOCK size represents max payload size. The current
value create inconsistencies for coap lib. The same way,
MAX_DOWNLOAD_DATA must allocate sufficient space for MAX_PAYLOAD_SIZE
plus all space for coap header etc.

Signed-off-by: Gerson Fernando Budke <[email protected]>
Signed-off-by: Otavio Salvador <[email protected]>
(cherry picked from commit 5f5919a)
Extract finish sha256 calc method.

Signed-off-by: Gerson Fernando Budke <[email protected]>
Signed-off-by: Otavio Salvador <[email protected]>
(cherry picked from commit 1fe1b0e)
The current version aborts update when found last transfer block. Now,
system checks only at end of coap block transfer total size and install
if download is ok.

Signed-off-by: Gerson Fernando Budke <[email protected]>
Signed-off-by: Otavio Salvador <[email protected]>
(cherry picked from commit 1128eab)
After a success image download, UpdateHub needs inform MCUboot that
must test new image and then, on success, commit this new image. This
add missing upgrade request call step and fixes the upgarde flow.

Signed-off-by: Gerson Fernando Budke <[email protected]>
Signed-off-by: Otavio Salvador <[email protected]>
(cherry picked from commit d1e2d34)
This replaces @chtavares592 with @nandojve as he will contributing to it
from now on.

Signed-off-by: Otavio Salvador <[email protected]>
(cherry picked from commit a3d6b62)
@nandojve nandojve changed the title [Backport v2.1-branch] lib: updatehub: Minor bug fixes [backport v2.1] lib: updatehub: Minor bug fixes Apr 3, 2020
@dleach02 dleach02 closed this Apr 7, 2020
@dleach02 dleach02 reopened this Apr 7, 2020
@carlescufi carlescufi requested review from d3zd3z and jukkar April 14, 2020 17:19
@dleach02 dleach02 closed this Apr 15, 2020
@dleach02 dleach02 reopened this Apr 15, 2020
@dleach02 dleach02 closed this Apr 16, 2020
@dleach02 dleach02 reopened this Apr 16, 2020
Copy link
Contributor

@d3zd3z d3zd3z left a comment

Choose a reason for hiding this comment

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

@otavio Can you make sure this is up to date with the merged version from #24154

@otavio
Copy link
Contributor Author

otavio commented Apr 17, 2020

@nandojve take a look please.

A malformed JSON payload that is received from an UpdateHub server
may trigger memory corruption in the Zephyr OS. This could result
in a denial of service in the best case, or code execution in the
worst case.

Signed-off-by: Gerson Fernando Budke <[email protected]>
Use bin2hex instead inline conversion.

Signed-off-by: Gerson Fernando Budke <[email protected]>
Improve buffer overflow security on probe_cb. This ensures that socket
buffer have fixed lenght and content received by COAP fills properly on
metadata buffer. After that, ensures that metadata content is a valid
string with length lower than metadata size.

Signed-off-by: Gerson Fernando Budke <[email protected]>
@nandojve
Copy link
Member

Added #24154

@nandojve nandojve requested a review from d3zd3z April 19, 2020 15:28
@dleach02 dleach02 closed this Apr 20, 2020
@dleach02 dleach02 reopened this Apr 20, 2020
@dleach02 dleach02 merged commit 4c5eabf into zephyrproject-rtos:v2.1-branch May 5, 2020
@nandojve nandojve deleted the v2.1-branch branch May 5, 2020 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants