lkml.org 
[lkml]   [2015]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] mfd: max77843: Fix max77843_chg_init() return on error
On Tue, 15 Sep 2015, Krzysztof Kozlowski wrote:

> 2015-09-14 17:23 GMT+09:00 Javier Martinez Canillas <javier@osg.samsung.com>:
> > If i2c_new_dummy() fails in max77843_chg_init(), an PTR_ERR(NULL) is
> > returned which is 0. So the function was wrongly returning a success
> > value instead of an error code.
> >
> > Fixes: c7f585fe46d8 ("mfd: max77843: Add max77843 MFD driver core driver")
> > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> >
> > ---
> >
> > drivers/mfd/max77843.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Nice catch. I think this should go to stable. I did not try to
> reproduce it but looking at the code this should lead to NULL pointer
> exceptions on:
> 1. first access to max77843->regmap_chg (this won't actually happen
> because charger driver was not merged);
> 2. first dereference of pointer returned by i2c_get_clientdata() which
> will happen on first system suspend or device unbind/removal.
>
> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Please re-send this with stable Cc'ed and Krzysztof's RB applied.

> > diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c
> > index c52162ea3d0a..586098f1b233 100644
> > --- a/drivers/mfd/max77843.c
> > +++ b/drivers/mfd/max77843.c
> > @@ -80,7 +80,7 @@ static int max77843_chg_init(struct max77693_dev *max77843)
> > if (!max77843->i2c_chg) {
> > dev_err(&max77843->i2c->dev,
> > "Cannot allocate I2C device for Charger\n");
> > - return PTR_ERR(max77843->i2c_chg);
> > + return -ENODEV;
> > }
> > i2c_set_clientdata(max77843->i2c_chg, max77843);
> >
> >

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog


\
 
 \ /
  Last update: 2015-09-20 06:41    [W:0.054 / U:7.172 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site