lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] staging: go7007: fix mismatch in mutex lock-unlock in [read|write]_reg_fp

Browse Source 
If go7007_usb_vendor_request() fails in write_reg_fp()
or in read_reg_fp(), the usb->i2c_lock mutex left locked.

The patch moves mutex_unlock(&usb->i2c_lock) before check
for go7007_usb_vendor_request() returned value.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Alexey Khoroshilov
2012-02-13 11:01:32 -03:00
committed by Mauro Carvalho Chehab
parent 06302ffbb4
commit 0c07aec31a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/media/go7007/s2250-board.c
View File

@@ -192,6 +192,7 @@ static int write_reg_fp(struct i2c_client *client, u16 addr, u16 val)
{ {
struct go7007 *go = i2c_get_adapdata(client->adapter); struct go7007 *go = i2c_get_adapdata(client->adapter);
struct go7007_usb *usb; struct go7007_usb *usb;
int rc;
u8 *buf; u8 *buf;
struct s2250 *dec = i2c_get_clientdata(client); struct s2250 *dec = i2c_get_clientdata(client);
@@ -216,12 +217,13 @@ static int write_reg_fp(struct i2c_client *client, u16 addr, u16 val)
kfree(buf); kfree(buf);
return -EINTR; return -EINTR;
} }
if (go7007_usb_vendor_request(go, 0x57, addr, val, buf, 16, 1) < 0) { rc = go7007_usb_vendor_request(go, 0x57, addr, val, buf, 16, 1);
mutex_unlock(&usb->i2c_lock);
if (rc < 0) {
kfree(buf); kfree(buf);
return -EFAULT; return rc;
} }
mutex_unlock(&usb->i2c_lock);
if (buf[0] == 0) { if (buf[0] == 0) {
unsigned int subaddr, val_read; unsigned int subaddr, val_read;
@@ -254,6 +256,7 @@ static int read_reg_fp(struct i2c_client *client, u16 addr, u16 *val)
{ {
struct go7007 *go = i2c_get_adapdata(client->adapter); struct go7007 *go = i2c_get_adapdata(client->adapter);
struct go7007_usb *usb; struct go7007_usb *usb;
int rc;
u8 *buf; u8 *buf;
if (go == NULL) if (go == NULL)
@@ -276,11 +279,12 @@ static int read_reg_fp(struct i2c_client *client, u16 addr, u16 *val)
kfree(buf); kfree(buf);
return -EINTR; return -EINTR;
} }
if (go7007_usb_vendor_request(go, 0x58, addr, 0, buf, 16, 1) < 0) { rc = go7007_usb_vendor_request(go, 0x58, addr, 0, buf, 16, 1);
kfree(buf);
return -EFAULT;
}
mutex_unlock(&usb->i2c_lock); mutex_unlock(&usb->i2c_lock);
if (rc < 0) {
kfree(buf);
return rc;
}
*val = (buf[0] << 8) | buf[1]; *val = (buf[0] << 8) | buf[1];
kfree(buf); kfree(buf);