From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Chris Healy <cphealy@gmail.com>, Kyle McMartin <kyle@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
David Woodhouse <dwmw2@infradead.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 2/5] ihex: Check if zero-length record is at the end of the blob
Date: Thu, 20 Dec 2018 23:28:38 -0800 [thread overview]
Message-ID: <20181221072841.30199-3-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20181221072841.30199-1-andrew.smirnov@gmail.com>
When verifying the validity of IHEX file we need to make sure that
zero-length record we found is located at the end of the file. Not
doing that could result in an invalid file with a bogus zero-length in
the middle short-circuiting the check and being reported as valid.
Cc: Chris Healy <cphealy@gmail.com>
Cc: Kyle McMartin <kyle@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
include/linux/ihex.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/ihex.h b/include/linux/ihex.h
index 9c701521176b..9130f307a420 100644
--- a/include/linux/ihex.h
+++ b/include/linux/ihex.h
@@ -49,7 +49,7 @@ static inline int ihex_validate_fw(const struct firmware *fw)
for (; rec <= end; rec = __ihex_next_binrec(rec)) {
/* Zero length marks end of records */
- if (!be16_to_cpu(rec->len))
+ if (rec == end && !be16_to_cpu(rec->len))
return 0;
}
return -EINVAL;
--
2.19.1
next prev parent reply other threads:[~2018-12-21 7:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-21 7:28 [PATCH 0/5] IHEX bug fix and some improvements Andrey Smirnov
2018-12-21 7:28 ` [PATCH 1/5] ihex: Share code between ihex_validate_fw() and ihex_next_binrec() Andrey Smirnov
2018-12-21 7:28 ` Andrey Smirnov [this message]
2018-12-21 7:28 ` [PATCH 3/5] ihex: Simplify next record offset calculation Andrey Smirnov
2018-12-21 7:28 ` [PATCH 4/5] tools/firmware/ihex2fw: " Andrey Smirnov
2018-12-21 7:28 ` [PATCH 5/5] tools/firmware/ihex2fw: Replace explicit alignment with ALIGN Andrey Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181221072841.30199-3-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=cphealy@gmail.com \
--cc=dwmw2@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=kyle@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®