From: Sascha Hauer <s.hauer@pengutronix.de>
To: Andreas Schmidt <mail@schmidt-andreas.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] watchdog: core: check hwdev before use it
Date: Wed, 25 Apr 2018 10:36:02 +0200 [thread overview]
Message-ID: <20180425083602.hylx5g56iztydjih@pengutronix.de> (raw)
In-Reply-To: <20180422182111.22256-1-mail@schmidt-andreas.de>
On Sun, Apr 22, 2018 at 08:21:11PM +0200, Andreas Schmidt wrote:
> Avoid null pointer access, if hwdev was not
> set before call watchdog_register.
>
> Signed-off-by: Andreas Schmidt <mail@schmidt-andreas.de>
> ---
> drivers/watchdog/wd_core.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c
> index d3305443d..56e8626cb 100644
> --- a/drivers/watchdog/wd_core.c
> +++ b/drivers/watchdog/wd_core.c
> @@ -112,10 +112,12 @@ static int watchdog_register_dev(struct watchdog *wd, const char *name, int id)
> int watchdog_register(struct watchdog *wd)
> {
> struct param_d *p;
> - const char *alias;
> + const char *alias = NULL;
> int ret = 0;
>
> - alias = of_alias_get(wd->hwdev->device_node);
> + if (wd->hwdev)
> + alias = of_alias_get(wd->hwdev->device_node);
> +
> if (alias)
> ret = watchdog_register_dev(wd, alias, DEVICE_ID_SINGLE);
>
> --
> 2.14.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 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:[~2018-04-25 8:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-22 18:21 Andreas Schmidt
2018-04-25 8:36 ` 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=20180425083602.hylx5g56iztydjih@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=mail@schmidt-andreas.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