From: Andreas Fritiofson Date: Wed, 18 Jul 2012 22:02:46 +0000 (+0200) Subject: kinetis: bugfix in kinetis_write() fallback path X-Git-Tag: v0.6.0-rc2~12 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=73d87c6210bcd049b738583973fefdea0e32c6fa;ds=sidebyside kinetis: bugfix in kinetis_write() fallback path Offset calculation into buffer was wrong and code would read outside buffer if count was not a multiple of four. Change-Id: Ied625b10221423d5a5f25d27ce1edd8c2c3eca8a Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/749 Reviewed-by: Peter Stuge Tested-by: jenkins Reviewed-by: Freddie Chopin --- diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c index 71722c645f..433d91e9e0 100644 --- a/src/flash/nor/kinetis.c +++ b/src/flash/nor/kinetis.c @@ -435,7 +435,13 @@ static int kinetis_write(struct flash_bank *bank, uint8_t *buffer, LOG_DEBUG("write longword @ %08X", offset + i); w0 = (0x06 << 24) | (bank->base + offset + i); - w1 = buf_get_u32(buffer + offset + i, 0, 32); + if (count - i < 4) { + uint32_t padding = 0xffffffff; + memcpy(&padding, buffer + i, count - i); + w1 = buf_get_u32(&padding, 0, 32); + } else { + w1 = buf_get_u32(buffer + i, 0, 32); + } result = kinetis_ftfx_command(bank, w0, w1, w2, &ftfx_fstat);