From: Sean Anderson <seanga2@gmail.com>
To: Simon Glass <sjg@chromium.org>, u-boot@lists.denx.de
Cc: Mikhail Ilin <ilin.mikhail.ol@gmail.com>
Subject: Re: [PATCH] ifwitool: Fix member access
Date: Sat, 21 Jan 2023 13:14:26 -0500 [thread overview]
Message-ID: <96cd50e1-babc-47cd-cc61-5dca67b3a711@gmail.com> (raw)
In-Reply-To: <20230118201317.1777857-1-sjg@chromium.org>
On 1/18/23 15:13, Simon Glass wrote:
> On a second and third look, a recent patch seems to be writing to the
> wrong place - updating offsets from the address of the pointer instead
> of what the pointer points to.
>
> Fix it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Fixes: 2d1b2ac13fe ("tool: ifwitool: Fix buffer overflow")
> ---
>
> tools/ifwitool.c | 40 ++++++++++++++++++++--------------------
> 1 file changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/tools/ifwitool.c b/tools/ifwitool.c
> index 31591863b2e..c1defe57737 100644
> --- a/tools/ifwitool.c
> +++ b/tools/ifwitool.c
> @@ -721,7 +721,7 @@ static size_t read_member(void *src, size_t offset, size_t size_bytes,
> */
> static size_t fix_member(void *data, size_t offset, size_t size_bytes)
> {
> - uint8_t *src = (uint8_t *)data + offset;
> + void *src = (uint8_t *)data + offset;
>
> switch (size_bytes) {
> case 1:
> @@ -1441,20 +1441,20 @@ static void bpdt_fixup_write_buffer(struct buffer *buf)
>
> size_t offset = 0;
>
> - offset = fix_member(&s, offset, sizeof(h->signature));
> - offset = fix_member(&s, offset, sizeof(h->descriptor_count));
> - offset = fix_member(&s, offset, sizeof(h->bpdt_version));
> - offset = fix_member(&s, offset, sizeof(h->xor_redundant_block));
> - offset = fix_member(&s, offset, sizeof(h->ifwi_version));
> - offset = fix_member(&s, offset, sizeof(h->fit_tool_version));
> + offset = fix_member(s, offset, sizeof(h->signature));
> + offset = fix_member(s, offset, sizeof(h->descriptor_count));
> + offset = fix_member(s, offset, sizeof(h->bpdt_version));
> + offset = fix_member(s, offset, sizeof(h->xor_redundant_block));
> + offset = fix_member(s, offset, sizeof(h->ifwi_version));
> + offset = fix_member(s, offset, sizeof(h->fit_tool_version));
>
> uint32_t i;
>
> for (i = 0; i < count; i++) {
> - offset = fix_member(&s, offset, sizeof(e[i].type));
> - offset = fix_member(&s, offset, sizeof(e[i].flags));
> - offset = fix_member(&s, offset, sizeof(e[i].offset));
> - offset = fix_member(&s, offset, sizeof(e[i].size));
> + offset = fix_member(s, offset, sizeof(e[i].type));
> + offset = fix_member(s, offset, sizeof(e[i].flags));
> + offset = fix_member(s, offset, sizeof(e[i].offset));
> + offset = fix_member(s, offset, sizeof(e[i].size));
> }
> }
>
> @@ -1654,21 +1654,21 @@ static void subpart_dir_fixup_write_buffer(struct buffer *buf)
> size_t count = h->num_entries;
> size_t offset = 0;
>
> - offset = fix_member(&s, offset, sizeof(h->marker));
> - offset = fix_member(&s, offset, sizeof(h->num_entries));
> - offset = fix_member(&s, offset, sizeof(h->header_version));
> - offset = fix_member(&s, offset, sizeof(h->entry_version));
> - offset = fix_member(&s, offset, sizeof(h->header_length));
> - offset = fix_member(&s, offset, sizeof(h->checksum));
> + offset = fix_member(s, offset, sizeof(h->marker));
> + offset = fix_member(s, offset, sizeof(h->num_entries));
> + offset = fix_member(s, offset, sizeof(h->header_version));
> + offset = fix_member(s, offset, sizeof(h->entry_version));
> + offset = fix_member(s, offset, sizeof(h->header_length));
> + offset = fix_member(s, offset, sizeof(h->checksum));
> offset += sizeof(h->name);
>
> uint32_t i;
>
> for (i = 0; i < count; i++) {
> offset += sizeof(e[i].name);
> - offset = fix_member(&s, offset, sizeof(e[i].offset));
> - offset = fix_member(&s, offset, sizeof(e[i].length));
> - offset = fix_member(&s, offset, sizeof(e[i].rsvd));
> + offset = fix_member(s, offset, sizeof(e[i].offset));
> + offset = fix_member(s, offset, sizeof(e[i].length));
> + offset = fix_member(s, offset, sizeof(e[i].rsvd));
> }
> }
>
This fixes build errors for me.
Acked-by: Sean Anderson <seanga2@gmail.com>
next prev parent reply other threads:[~2023-01-21 18:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 20:13 [PATCH] ifwitool: Fix member access Simon Glass
2023-01-21 18:14 ` Sean Anderson [this message]
2023-01-21 18:17 ` Sean Anderson
2023-01-21 18:17 ` Sean Anderson
2023-01-27 19:07 ` Tom Rini
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=96cd50e1-babc-47cd-cc61-5dca67b3a711@gmail.com \
--to=seanga2@gmail.com \
--cc=ilin.mikhail.ol@gmail.com \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/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