[nrf fromtre] mcumgr/img_mgmt: CONFIG_MCUBOOT_BOOTLOADER_NO_DOWNGRADE fixes #1662
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nvlsianpu
requested changes
Apr 24, 2024
| @@ -471,7 +471,7 @@ os_mgmt_bootloader_info(struct smp_streamer *ctxt) | |||
| zcbor_int32_put(zse, BOOTLOADER_MODE); | |||
| #if IS_ENABLED(MCUBOOT_BOOTLOADER_NO_DOWNGRADE) | |||
| ok = zcbor_tstr_put_lit(zse, "no-downgrade") && | |||
| zcbor_bool_encode(zse, true); | |||
| zcbor_bool_encode(zse, &true); | |||
There was a problem hiding this comment.
strange - true is not a variable or so
There was a problem hiding this comment.
Compiler loads true on stack and gets pointer to stack, it works, although I can make this more clear.
There was a problem hiding this comment.
this throws a compiler error
de-nordic
force-pushed
the
fix-zcbor-in-os_mgmt_bootloader_info
branch
from
1a55fbe to
7d5d68e
Compare
tejlmand
reviewed
Apr 25, 2024
|
@nvlsianpu ping |
…GRADE Usage of the Kconfig, in code, has been missing CONFIG_, so selected or not it did nothing. (cherry picked from commit 1ec7116) Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
…_info There have been to problems with the code where zcbor_bool_encode has been fed value instead of expected pointer and the result of previous zcbor_encode operations has not been taken to evaluate value of ok status. The change also replaces usage of #if IS_ENABLED with #ifdef, as IS_ENABLED should not be used outside if(). (cherry picked from commit c007e71) Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
de-nordic
force-pushed
the
fix-zcbor-in-os_mgmt_bootloader_info
branch
from
7d5d68e to
3e334e1
Compare
de-nordic
changed the title
de-nordic
changed the title
nvlsianpu
approved these changes
Apr 25, 2024
nordicjm
approved these changes
Apr 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are two fixes now.
Previously there has been one, but it required conflict resolution at cherry-pick as there has been previous change missing;
this time both changes are brought.