Commit de880538 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Wim Van Sebroeck

watchdog: ziirave_wdt: Don't read out more than 'len' firmware bytes

We only compare first 'len' bytes of read firmware, so we don't need
to read more that that.
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Rick Ramstetter <rick@anteaterllc.com>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20190812200906.31344-14-andrew.smirnov@gmail.comSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent d91bb8d9
...@@ -318,6 +318,8 @@ static int ziirave_firm_verify(struct watchdog_device *wdd, ...@@ -318,6 +318,8 @@ static int ziirave_firm_verify(struct watchdog_device *wdd,
u16 addr; u16 addr;
for (rec = (void *)fw->data; rec; rec = ihex_next_binrec(rec)) { for (rec = (void *)fw->data; rec; rec = ihex_next_binrec(rec)) {
const u16 len = be16_to_cpu(rec->len);
addr = (be32_to_cpu(rec->addr) & 0xffff) >> 1; addr = (be32_to_cpu(rec->addr) & 0xffff) >> 1;
if (addr < ZIIRAVE_FIRM_FLASH_MEMORY_START || if (addr < ZIIRAVE_FIRM_FLASH_MEMORY_START ||
addr > ZIIRAVE_FIRM_FLASH_MEMORY_END) addr > ZIIRAVE_FIRM_FLASH_MEMORY_END)
...@@ -331,7 +333,7 @@ static int ziirave_firm_verify(struct watchdog_device *wdd, ...@@ -331,7 +333,7 @@ static int ziirave_firm_verify(struct watchdog_device *wdd,
return ret; return ret;
} }
for (i = 0; i < ARRAY_SIZE(data); i++) { for (i = 0; i < len; i++) {
ret = i2c_smbus_read_byte_data(client, ret = i2c_smbus_read_byte_data(client,
ZIIRAVE_CMD_DOWNLOAD_READ_BYTE); ZIIRAVE_CMD_DOWNLOAD_READ_BYTE);
if (ret < 0) { if (ret < 0) {
...@@ -342,7 +344,7 @@ static int ziirave_firm_verify(struct watchdog_device *wdd, ...@@ -342,7 +344,7 @@ static int ziirave_firm_verify(struct watchdog_device *wdd,
data[i] = ret; data[i] = ret;
} }
if (memcmp(data, rec->data, be16_to_cpu(rec->len))) { if (memcmp(data, rec->data, len)) {
dev_err(&client->dev, dev_err(&client->dev,
"Firmware mismatch at address 0x%04x\n", addr); "Firmware mismatch at address 0x%04x\n", addr);
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment