From: David Gibson <david-xT8FGy+AXnRB3Ne2BGzF6laj5H9X9Tb+@public.gmane.org>
To: Frank Mehnert <frank.mehnert-2ptZNfhJYoRaodhZ+FW2PA@public.gmane.org>
Cc: devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH] libfdt: fix fdt_check_node_offset_ w/ VALID_INPUT
Date: Fri, 14 Aug 2020 13:17:48 +1000 [thread overview]
Message-ID: <20200814031748.GA12805@yekko.fritz.box> (raw)
In-Reply-To: <1913141.TlUzK5foHS@noys4>
[-- Attachment #1: Type: text/plain, Size: 2240 bytes --]
On Thu, Aug 13, 2020 at 05:26:26PM +0200, Frank Mehnert wrote:
> fdt_check_node_offset_() checks for a valid offset but also changes the
> offset by calling fdt_next_tag(). Hence, do not skip this function if
> ASSUME_VALID_INPUT is set but only omit the initial offset check in that
> case.
>
> As this function works very similar to fdt_check_prop_offset_(), do the
> offset check there as well depending on ASSUME_VALID_INPUT.
So, it looks like your mailer has mangled the patch (replacing tabs
with spaces). Since it's simple, I fixed it up this time, though.
Applied.
> ---
> libfdt/fdt.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/libfdt/fdt.c b/libfdt/fdt.c
> index c28fcc1..37b7b93 100644
> --- a/libfdt/fdt.c
> +++ b/libfdt/fdt.c
> @@ -206,10 +206,11 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)
>
> int fdt_check_node_offset_(const void *fdt, int offset)
> {
> - if (can_assume(VALID_INPUT))
> - return offset;
> - if ((offset < 0) || (offset % FDT_TAGSIZE)
> - || (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE))
> + if (!can_assume(VALID_INPUT)
> + && ((offset < 0) || (offset % FDT_TAGSIZE)))
> + return -FDT_ERR_BADOFFSET;
> +
> + if (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE)
> return -FDT_ERR_BADOFFSET;
>
> return offset;
> @@ -217,8 +218,11 @@ int fdt_check_node_offset_(const void *fdt, int offset)
>
> int fdt_check_prop_offset_(const void *fdt, int offset)
> {
> - if ((offset < 0) || (offset % FDT_TAGSIZE)
> - || (fdt_next_tag(fdt, offset, &offset) != FDT_PROP))
> + if (!can_assume(VALID_INPUT)
> + && ((offset < 0) || (offset % FDT_TAGSIZE)))
> + return -FDT_ERR_BADOFFSET;
> +
> + if (fdt_next_tag(fdt, offset, &offset) != FDT_PROP)
> return -FDT_ERR_BADOFFSET;
>
> return offset;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-08-14 3:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-13 7:55 [PATCH] libfdt: fix fdt_check_node_offset_ w/ VALID_INPUT Frank Mehnert
2020-08-13 9:51 ` David Gibson
[not found] ` <20200813095108.GA181791-l+x2Y8Cxqc4e6aEkudXLsA@public.gmane.org>
2020-08-13 15:26 ` Frank Mehnert
2020-08-14 3:17 ` David Gibson [this message]
[not found] ` <20200814031748.GA12805-l+x2Y8Cxqc4e6aEkudXLsA@public.gmane.org>
2020-08-14 6:47 ` Frank Mehnert
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=20200814031748.GA12805@yekko.fritz.box \
--to=david-xt8fgy+axnrb3ne2bgzf6laj5h9x9tb+@public.gmane.org \
--cc=devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=frank.mehnert-2ptZNfhJYoRaodhZ+FW2PA@public.gmane.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).