rapidio: fix get device imbalance on error
PATCH 1/1 rapidio: fix get device imbalance on error
Fix the imbalance in mport_cdev_open.
Call put_device in error path to balance the
refcount that increased by the get_device.
--- drivers/rapidio/devices/rio_mport_cdev.c | 1 + 1 file changed, 1 insertion(+)
drivers/rapidio/devices/rio_mport_cdev.c +1 -0
@@ -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;
Signature · 1 line
2.17.1
Quoted 16 lines · George Acosta
Fix the imbalance in
mport_cdev_open.
Callput_devicein error path to balance the
refcount that increased by theget_device.Fixes e8de370188d0 ("rapidio: add mport char device driver")Signed-off-by George Acosta <[email protected]>--- drivers/rapidio/devices/rio_mport_cdev.c | 1 + 1 file changed, 1 insertion(+)drivers/rapidio/devices/rio_mport_cdev.c +0
-0
drivers/rapidio/devices/rio_mport_cdev.c static int mport_cdev_open(struct inode *inode, struct file *filp) · line 1914
Quoted 7 lines
drivers/rapidio/devices/rio_mport_cdev.c +1
-0@@ -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