Re: [PATCH v2 1/1] pwm: sun4i: fix a possible NULL dereference

From	LABBE Corentin <clabbe.montjoie@gmail.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH v2 1/1] pwm: sun4i: fix a possible NULL dereference
Date	2016-08-24 13:50 +0200
Message-ID	<s9EQW-1Ge-31@gated-at.bofh.it> (permalink)
References	<s6MrD-3zL-7@gated-at.bofh.it> <s6MrD-3zL-5@gated-at.bofh.it> <s8Rnb-2P6-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Mon, Aug 22, 2016 at 08:57:37AM +0200, Maxime Ripard wrote:
> Hi,
> 
> On Tue, Aug 16, 2016 at 03:18:06PM +0200, LABBE Corentin wrote:
> > of_match_device could return NULL, and so cause a NULL pointer
> > dereference later.
> > 
> > For fixing this problem, we use of_device_get_match_data(), this will
> > simplify the code a little by using a standard function for
> > getting the match data.
> > 
> > Reported-by: coverity (CID 1324139)
> > Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
> > ---
> >  drivers/pwm/pwm-sun4i.c | 5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> > 
> > diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c
> > index 03a99a5..72f0060 100644
> > --- a/drivers/pwm/pwm-sun4i.c
> > +++ b/drivers/pwm/pwm-sun4i.c
> > @@ -309,9 +309,6 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
> >  	struct resource *res;
> >  	u32 val;
> >  	int i, ret;
> > -	const struct of_device_id *match;
> > -
> > -	match = of_match_device(sun4i_pwm_dt_ids, &pdev->dev);
> >  
> >  	pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL);
> >  	if (!pwm)
> > @@ -326,7 +323,7 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
> >  	if (IS_ERR(pwm->clk))
> >  		return PTR_ERR(pwm->clk);
> >  
> > -	pwm->data = match->data;
> > +	pwm->data = of_device_get_match_data(&pdev->dev);
> 
> How does that fix anything?
> 
> If of_match_data fails, it will return NULL, and the NULL pointer
> dereference will occur in the exact same cases.
> 
> You should just check for match to be NULL, and return in this case.
> 
> Maxime
> 

I apologize for havent seen this subsuquent NULL deref.

I send an updated version soon.

Regards

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/1] pwm: sun4i: fix a possible NULL dereference LABBE Corentin <clabbe.montjoie@gmail.com> - 2016-08-16 15:20 +0200
  Re: [PATCH v2 1/1] pwm: sun4i: fix a possible NULL dereference Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-08-22 09:00 +0200
    Re: [PATCH v2 1/1] pwm: sun4i: fix a possible NULL dereference LABBE Corentin <clabbe.montjoie@gmail.com> - 2016-08-24 13:50 +0200

csiph-web