From: Sascha Hauer <sha@pengutronix.de>
To: Edoardo Scaglia <scaglia@amelchem.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] of: partitions: fix NULL pointer dereference in of_partition_fixup()
Date: Wed, 10 Feb 2021 10:17:54 +0100 [thread overview]
Message-ID: <20210210091754.GR19583@pengutronix.de> (raw)
In-Reply-To: <20210209134936.2551-1-scaglia@amelchem.com>
On Tue, Feb 09, 2021 at 02:49:36PM +0100, Edoardo Scaglia wrote:
> When barebox 'internal devicetree' is not used and your board
> registers a device that in turn registers a of_partition_fixup() (such
> as at24 EEPROM), running the bootm command crashes barebox with a NULL
> pointer dereference.
>
> The error occurs when barebox applies Linux DTB fixups, specifically
> in following lines of_partition_fixup():
>
> name = of_get_reproducible_name(cdev->device_node);
> np = of_find_node_by_reproducible_name(root, name);
>
> since internal devicetree is not used cdev->device_node is NULL thus
> of_get_reproducibile_name() returns NULL then NULL is passed as lookup
> string to of_find_node_by_reproducible_name() which crashes trying to
> dereference NULL pointer.
>
> The culprit is commit fa9179444c36f9daf5010215cf8e4dcb3bd1ffb2.
> Previously of_partition_fixup() returned -EINVAL when
> cdev->device_node was NULL, apparently that check was lost along the
> road.
>
> Signed-off-by: Edoardo Scaglia <scaglia@amelchem.com>
> ---
> drivers/of/partition.c | 3 +++
> 1 file changed, 3 insertions(+)
Applied to master, thanks
Sascha
>
> diff --git a/drivers/of/partition.c b/drivers/of/partition.c
> index 65c24c5426..b71716218b 100644
> --- a/drivers/of/partition.c
> +++ b/drivers/of/partition.c
> @@ -235,6 +235,9 @@ static int of_partition_fixup(struct device_node *root, void *ctx)
> struct device_node *np;
> char *name;
>
> + if (!cdev->device_node)
> + return -EINVAL;
> +
> name = of_get_reproducible_name(cdev->device_node);
> np = of_find_node_by_reproducible_name(root, name);
> free(name);
> --
> 2.30.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2021-02-10 9:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 13:49 Edoardo Scaglia
2021-02-10 9:17 ` Sascha Hauer [this message]
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=20210210091754.GR19583@pengutronix.de \
--to=sha@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=scaglia@amelchem.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