Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c07aec3 authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 06302ffb

drivers/staging/media/go7007/s2250-board.c

+10 −6
Original line number Diff line number Diff line
@@ -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_usb *usb;

	int rc;

	u8 *buf;

	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);

		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);

		return -EFAULT;

		return rc;

	}



	mutex_unlock(&usb->i2c_lock);

	if (buf[0] == 0) {

		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_usb *usb;

	int rc;

	u8 *buf;



	if (go == NULL)
@@ -276,11 +279,12 @@ static int read_reg_fp(struct i2c_client *client, u16 addr, u16 *val) 
		kfree(buf);

		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);

	mutex_unlock(&usb->i2c_lock);

	if (rc < 0) {

		kfree(buf);

		return -EFAULT;

		return rc;

	}

	mutex_unlock(&usb->i2c_lock);



	*val = (buf[0] << 8) | buf[1];

	kfree(buf);