Skip to content

L
linux-davinci
Commit 80b60b6b authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files
Options

Merge commit 'irda/for-next'

parents b8ed8e7c 1d71d682
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
drivers/net/irda/irda-usb.c
View file @ 80b60b6b
...@@ -1124,11 +1124,12 @@ static int stir421x_patch_device(struct irda_usb_cb *self) ...@@ -1124,11 +1124,12 @@ static int stir421x_patch_device(struct irda_usb_cb *self)
* The actual image starts after the "STMP" keyword * The actual image starts after the "STMP" keyword
* so forward to the firmware header tag * so forward to the firmware header tag
*/ */
for (i = 0; (fw->data[i] != STIR421X_PATCH_END_OF_HDR_TAG) for (i = 0; i < fw->size && fw->data[i] !=
&& (i < fw->size); i++) ; STIR421X_PATCH_END_OF_HDR_TAG; i++)
;
/* here we check for the out of buffer case */ /* here we check for the out of buffer case */
if ((STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i]) if (i < STIR421X_PATCH_CODE_OFFSET && i < fw->size &&
&& (i < STIR421X_PATCH_CODE_OFFSET)) { STIR421X_PATCH_END_OF_HDR_TAG == fw->data[i]) {
if (!memcmp(fw->data + i + 1, STIR421X_PATCH_STMP_TAG, if (!memcmp(fw->data + i + 1, STIR421X_PATCH_STMP_TAG,
sizeof(STIR421X_PATCH_STMP_TAG) - 1)) { sizeof(STIR421X_PATCH_STMP_TAG) - 1)) {
......
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