TrustedFirmware Git Browser
Code Review Sign In
review.trustedfirmware.org / mirror / mcuboot / d4d90f8eea61cb38dc23f5d05fe06e5a0d5a86cf
commitd4d90f8eea61cb38dc23f5d05fe06e5a0d5a86cf[log] [tgz]
authorGeorge Beckstein <george.beckstein@gmail.com>Tue May 11 02:00:00 2021 -0400
committerDavid Brown <davidb@davidb.org>Fri May 14 14:57:17 2021 -0600
tree519b120c7d9edaae6cee695d6320a109f65bf46e
parentfe0bfcfba96a1b36bb37e6c3dbf6534f8750ed0d [diff]
Fix version comparison result causing boot failure

The variable `rc` is used in `context_boot_go` for a number of operations, mostly checking return codes for an error. It is also used to store the result of comparing the installed application version numbers (using `boot_version_cmp`).

At the end of `context_boot_go`, `rc` is returned as the result of the operation.

In some configurations, namely direct XIP (without revert or any other extra boot checks), it is possible for the comparison result to be the last value of `rc`. In most cases, this will cause `context_boot_go` to report a failure (ie: non-zero return code), as the value of `rc` will be 1 or -1 if the installed applications aren't the same version.

This commit resets the value of `rc` to 0 after the version comparison has taken place.

Fixes #976

Signed-off-by: George Beckstein <george.beckstein@gmail.com>
1 file changed
tree: 519b120c7d9edaae6cee695d6320a109f65bf46e
  1. .github/
  2. boot/
  3. ci/
  4. docs/
  5. ext/
  6. ptest/
  7. samples/
  8. scripts/
  9. sim/
  10. testplan/
  11. zephyr/
  12. .gitignore
  13. .gitmodules
  14. .mbedignore
  15. .travis.yml
  16. enc-aes128kw.b64
  17. enc-ec256-priv.pem
  18. enc-ec256-pub.pem
  19. enc-rsa2048-priv.pem
  20. enc-rsa2048-pub.pem
  21. enc-x25519-priv.pem
  22. enc-x25519-pub.pem
  23. go.mod
  24. LICENSE
  25. NOTICE
  26. project.yml
  27. README.md
  28. repository.yml
  29. root-ec-p256-pkcs8.pem
  30. root-ec-p256.pem
  31. root-ed25519.pem
  32. root-rsa-2048.pem
  33. root-rsa-3072.pem
README.md

mcuboot

Package on PyPI Coverity Scan Build Status Build Status (Sim) Build Status (Mynewt) Publishing Status (imgtool) Build Status (Travis CI) Apache 2.0

This is mcuboot version 1.8.0-dev

MCUboot is a secure bootloader for 32-bit MCUs. The goal of MCUboot is to define a common infrastructure for the bootloader, system flash layout on microcontroller systems, and to provide a secure bootloader that enables simple software upgrades.

MCUboot is operating system and hardware independent and relies on hardware porting layers from the operating. Currently, mcuboot works with both the Apache Mynewt and Zephyr operating systems, but more ports are planned in the future. RIOT is currently supported as a boot target with a complete port planned.

Using MCUboot

Instructions for different operating systems can be found here:

Roadmap

The issues being planned and worked on are tracked using GitHub issues. To participate please visit:

MCUBoot GitHub Issues

Issues were previously tracked on MCUboot JIRA , but it is now deprecated.

Browsing

Information and documentation on the bootloader are stored within the source.

It was previously also documented on confluence: MCUBoot Confluence however, it is now deprecated and not currently maintained

For more information in the source, here are some pointers:

  • boot/bootutil: The core of the bootloader itself.
  • boot/boot_serial: Support for serial upgrade within the bootloader itself.
  • boot/zephyr: Port of the bootloader to Zephyr
  • boot/mynewt: Mynewt bootloader app
  • imgtool: A tool to securely sign firmware images for booting by mcuboot.
  • sim: A bootloader simulator for testing and regression

Joining

Developers welcome!