linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch] iio: inkern: fix a NULL dereference on error
@ 2016-01-26  9:25 Dan Carpenter
  2016-01-30 15:39 ` Jonathan Cameron
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2016-01-26  9:25 UTC (permalink / raw)
  To: Jonathan Cameron, Marek Belisko
  Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald, linux-iio,
	linux-kernel, kernel-janitors

In twl4030_bci_probe() there are some failure paths where we call
iio_channel_release() with a NULL pointer.  (Apparently, that driver can
opperate without a valid channel pointer).  Let's fix it by adding a
NULL check in iio_channel_release().

Fixes: 2202e1fc5a29 ('drivers: power: twl4030_charger: fix link problems when building as module')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index 80fbbfd..734a004 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -349,6 +349,8 @@ EXPORT_SYMBOL_GPL(iio_channel_get);
 
 void iio_channel_release(struct iio_channel *channel)
 {
+	if (!channel)
+		return;
 	iio_device_put(channel->indio_dev);
 	kfree(channel);
 }

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [patch] iio: inkern: fix a NULL dereference on error
  2016-01-26  9:25 [patch] iio: inkern: fix a NULL dereference on error Dan Carpenter
@ 2016-01-30 15:39 ` Jonathan Cameron
  0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2016-01-30 15:39 UTC (permalink / raw)
  To: Dan Carpenter, Marek Belisko
  Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald, linux-iio,
	linux-kernel, kernel-janitors

On 26/01/16 09:25, Dan Carpenter wrote:
> In twl4030_bci_probe() there are some failure paths where we call
> iio_channel_release() with a NULL pointer.  (Apparently, that driver can
> opperate without a valid channel pointer).  Let's fix it by adding a
> NULL check in iio_channel_release().
> 
> Fixes: 2202e1fc5a29 ('drivers: power: twl4030_charger: fix link problems when building as module')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
Whilst I'd prefer to see the driver calling this have balanced
calls, I can see that having this sanity check in here is
probably sensible.

Applied to the fixes-togreg tree and marked for stable.

Jonathan
> diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
> index 80fbbfd..734a004 100644
> --- a/drivers/iio/inkern.c
> +++ b/drivers/iio/inkern.c
> @@ -349,6 +349,8 @@ EXPORT_SYMBOL_GPL(iio_channel_get);
>  
>  void iio_channel_release(struct iio_channel *channel)
>  {
> +	if (!channel)
> +		return;
>  	iio_device_put(channel->indio_dev);
>  	kfree(channel);
>  }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-01-30 15:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-26  9:25 [patch] iio: inkern: fix a NULL dereference on error Dan Carpenter
2016-01-30 15:39 ` Jonathan Cameron

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).