lkml.org 
[lkml]   [2009]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] fix lock imbalances in /drivers/media/video/cafe_ccic.c
Date
In ./drivers/media/video/cafe_ccic.c, in function cafe_pci_probe: 
Mutex must be unlocked before exit
1. On paths starting with mutex lock in line 1912, then continuing in lines:
1929, 1936 (goto unreg) and 1940 (goto iounmap) .
2. On path starting in line 1971 mutex lock, and then continuing in line 1978
(goto out_smbus) mutex.

Fix lock imbalances in function cafe_pci_probe.
Found by Linux Driver Verification project.

Signed-off-by: Alexander Strakh <strakh@ispras.ru>

---
diff --git a/./a/drivers/media/video/cafe_ccic.c
b/./b/drivers/media/video/cafe_ccic.c
index c4d181d..2987433 100644
--- a/./a/drivers/media/video/cafe_ccic.c
+++ b/./b/drivers/media/video/cafe_ccic.c
@@ -1925,19 +1925,24 @@ static int cafe_pci_probe(struct pci_dev *pdev,
* Get set up on the PCI bus.
*/
ret = pci_enable_device(pdev);
- if (ret)
+ if (ret) {
+ mutex_unlock(&cam->s_mutex);
goto out_unreg;
+ }
pci_set_master(pdev);

ret = -EIO;
cam->regs = pci_iomap(pdev, 0, 0);
if (! cam->regs) {
printk(KERN_ERR "Unable to ioremap cafe-ccic regs\n");
+ mutex_unlock(&cam->s_mutex);
goto out_unreg;
}
ret = request_irq(pdev->irq, cafe_irq, IRQF_SHARED, "cafe-ccic", cam);
- if (ret)
+ if (ret) {
+ mutex_unlock(&cam->s_mutex);
goto out_iounmap;
+ }
/*
* Initialize the controller and leave it powered up. It will
* stay that way until the sensor driver shows up.
@@ -1974,8 +1979,10 @@ static int cafe_pci_probe(struct pci_dev *pdev,
/* cam->vdev.debug = V4L2_DEBUG_IOCTL_ARG;*/
cam->vdev.v4l2_dev = &cam->v4l2_dev;
ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1);
- if (ret)
+ if (ret) {
+ mutex_unlock(&cam->s_mutex);
goto out_smbus;
+ }
video_set_drvdata(&cam->vdev, cam);

/*


\
 
 \ /
  Last update: 2009-09-10 16:39    [W:0.075 / U:16.620 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site