public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] rapidio: fix get device imbalance on error
@ 2020-08-21  3:44 George Acosta
  2020-08-21  8:14 ` Dan Carpenter
  0 siblings, 1 reply; 2+ messages in thread
From: George Acosta @ 2020-08-21  3:44 UTC (permalink / raw)
  To: acostag.ubuntu
  Cc: Matt Porter, Alexandre Bounine, Andrew Morton, John Hubbard,
	Gustavo A. R. Silva, Madhuparna Bhowmik, Kees Cook, Dan Carpenter,
	linux-kernel

Fix the imbalance in mport_cdev_open.
Call put_device in error path to balance the
refcount that increased by the get_device.

Fixes: e8de370188d0 ("rapidio: add mport char device driver")
Signed-off-by: George Acosta <acostag.ubuntu@gmail.com>
---
 drivers/rapidio/devices/rio_mport_cdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index c07ceec3c6d4..3b68e00eb40f 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -1908,6 +1908,7 @@ static int mport_cdev_open(struct inode *inode, struct file *filp)
 			  sizeof(struct rio_event) * MPORT_EVENT_DEPTH,
 			  GFP_KERNEL);
 	if (ret < 0) {
+		put_device(&chdev->dev);
 		dev_err(&chdev->dev, DRV_NAME ": kfifo_alloc failed\n");
 		ret = -ENOMEM;
 		goto err_fifo;
-- 
2.17.1


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

* Re: [PATCH] rapidio: fix get device imbalance on error
  2020-08-21  3:44 [PATCH] rapidio: fix get device imbalance on error George Acosta
@ 2020-08-21  8:14 ` Dan Carpenter
  0 siblings, 0 replies; 2+ messages in thread
From: Dan Carpenter @ 2020-08-21  8:14 UTC (permalink / raw)
  To: George Acosta
  Cc: Matt Porter, Alexandre Bounine, Andrew Morton, John Hubbard,
	Gustavo A. R. Silva, Madhuparna Bhowmik, Kees Cook, linux-kernel

On Thu, Aug 20, 2020 at 10:44:57PM -0500, George Acosta wrote:
> Fix the imbalance in mport_cdev_open.
> Call put_device in error path to balance the
> refcount that increased by the get_device.
> 
> Fixes: e8de370188d0 ("rapidio: add mport char device driver")
> Signed-off-by: George Acosta <acostag.ubuntu@gmail.com>
> ---
>  drivers/rapidio/devices/rio_mport_cdev.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
> index c07ceec3c6d4..3b68e00eb40f 100644
> --- a/drivers/rapidio/devices/rio_mport_cdev.c
> +++ b/drivers/rapidio/devices/rio_mport_cdev.c
> @@ -1908,6 +1908,7 @@ static int mport_cdev_open(struct inode *inode, struct file *filp)
>  			  sizeof(struct rio_event) * MPORT_EVENT_DEPTH,
>  			  GFP_KERNEL);
>  	if (ret < 0) {
> +		put_device(&chdev->dev);
>  		dev_err(&chdev->dev, DRV_NAME ": kfifo_alloc failed\n");
>  		ret = -ENOMEM;
>  		goto err_fifo;
> -- 

If we ever hit this error path then the:

	list_add_tail(&priv->list, &chdev->file_list);

needs to be removed from the list as well or it lead to a use after
free.  Probably just move the list_add_tail() after the kfifo_alloc()
has succeeded. We need to remove it from the list in mport_cdev_release()
as well...

The error handling in this function is kind of rubbish.
1) Get rid of the out label and return directly (more readable).
1b) Use "return 0;" instead of "retur ret;" for the success path.
2) Name the labels after what they do not where they "come from".  In
other words do.

err_priv:
	kfree(priv);

3) Create a label to call put_device:

err_device:
	put_device(&chdev->dev);

Change all the error paths to use the goto instead of calling
put_device() before the goto.

regards,
dan carpenter

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

end of thread, other threads:[~2020-08-21  8:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-21  3:44 [PATCH] rapidio: fix get device imbalance on error George Acosta
2020-08-21  8:14 ` Dan Carpenter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox