Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Bootloader: protect against random input to bootloader 

require both a good sync and get_device before accepting destructive
operations
This commit is contained in:
Andrew Tridgell 2018-06-28 12:26:47 +10:00
parent 6cf205bdbe
commit d470c161e8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tools/AP_Bootloader/bl_protocol.cpp
View File

@ -316,6 +316,8 @@ bootloader(unsigned timeout)
{ {
uint32_t address = board_info.fw_size; /* force erase before upload will work */ uint32_t address = board_info.fw_size; /* force erase before upload will work */
uint32_t first_word = 0xffffffff; uint32_t first_word = 0xffffffff;
bool done_sync = false;
bool done_get_device = false;
chVTObjectInit(&systick_vt); chVTObjectInit(&systick_vt);
chVTSet(&systick_vt, MS2ST(1), sys_tick_handler, nullptr); chVTSet(&systick_vt, MS2ST(1), sys_tick_handler, nullptr);
@ -366,7 +368,7 @@ bootloader(unsigned timeout)
if (!wait_for_eoc(2)) { if (!wait_for_eoc(2)) {
goto cmd_bad; goto cmd_bad;
} }
done_sync = true;
break; break;
// get device info // get device info
@ -422,7 +424,7 @@ bootloader(unsigned timeout)
default: default:
goto cmd_bad; goto cmd_bad;
} }
done_get_device = true;
break; break;
// erase and prepare for programming // erase and prepare for programming
@ -433,6 +435,11 @@ bootloader(unsigned timeout)
// //
case PROTO_CHIP_ERASE: case PROTO_CHIP_ERASE:
if (!done_sync || !done_get_device) {
// lower chance of random data on a uart triggering erase
goto cmd_bad;
}
/* expect EOC */ /* expect EOC */
if (!wait_for_eoc(2)) { if (!wait_for_eoc(2)) {
goto cmd_bad; goto cmd_bad;
@ -473,6 +480,11 @@ bootloader(unsigned timeout)
// readback failure: INSYNC/FAILURE // readback failure: INSYNC/FAILURE
// //
case PROTO_PROG_MULTI: // program bytes case PROTO_PROG_MULTI: // program bytes
if (!done_sync || !done_get_device) {
// lower chance of random data on a uart triggering erase
goto cmd_bad;
}
// expect count // expect count
led_set(LED_OFF); led_set(LED_OFF);