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@xxxxxxxxxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
