diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2018-01-22 16:14:44 +1100 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2018-01-22 16:14:44 +1100 |
| commit | ba6d9c1a971db3c42bf0b054ebb64f72b3e3ddba (patch) | |
| tree | 8ed033bc7e69f9e1a86b42bee6a87420ab23f54f /Bootloaders/HID | |
| parent | 8802907ce274489690f8edf169454f750c8efe57 (diff) | |
| download | lufa-ba6d9c1a971db3c42bf0b054ebb64f72b3e3ddba.tar.gz lufa-ba6d9c1a971db3c42bf0b054ebb64f72b3e3ddba.tar.bz2 lufa-ba6d9c1a971db3c42bf0b054ebb64f72b3e3ddba.zip | |
Fixed bootloaders accepting flash writes to the bootloader region (thanks to NicoHood).
Diffstat (limited to 'Bootloaders/HID')
| -rw-r--r-- | Bootloaders/HID/BootloaderHID.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Bootloaders/HID/BootloaderHID.c b/Bootloaders/HID/BootloaderHID.c index c21bf5692..e5b7d3258 100644 --- a/Bootloaders/HID/BootloaderHID.c +++ b/Bootloaders/HID/BootloaderHID.c @@ -152,6 +152,10 @@ void EVENT_USB_Device_ControlRequest(void) uint16_t PageAddress = Endpoint_Read_16_LE(); #endif + /* Determine if the given page address is correctly aligned to the + start of a flash page. */ + bool PageAddressIsAligned = !(PageAddress & (SPM_PAGESIZE - 1)); + /* Check if the command is a program page command, or a start application command */ #if (FLASHEND > 0xFFFF) if ((uint16_t)(PageAddress >> 8) == COMMAND_STARTAPPLICATION) @@ -161,7 +165,7 @@ void EVENT_USB_Device_ControlRequest(void) { RunBootloader = false; } - else if (PageAddress < BOOT_START_ADDR) + else if ((PageAddress < BOOT_START_ADDR) && PageAddressIsAligned) { /* Erase the given FLASH page, ready to be programmed */ ATOMIC_BLOCK(ATOMIC_RESTORESTATE) |