Commit dfd395af authored by Dan Carpenter's avatar Dan Carpenter Committed by Jiri Kosina
Browse files

HID: unlock properly on error paths in hidraw_ioctl() 



We can't return immediately because lock_kernel() is held.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 35cfd1d9

drivers/hid/hidraw.c

+9 −5
Original line number Diff line number Diff line
@@ -267,8 +267,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, 
		default:

			{

				struct hid_device *hid = dev->hid;

				if (_IOC_TYPE(cmd) != 'H' || _IOC_DIR(cmd) != _IOC_READ)

					return -EINVAL;

				if (_IOC_TYPE(cmd) != 'H' || _IOC_DIR(cmd) != _IOC_READ) {

					ret = -EINVAL;

					break;

				}



				if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) {

					int len;
@@ -277,8 +279,9 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, 
					len = strlen(hid->name) + 1;

					if (len > _IOC_SIZE(cmd))

						len = _IOC_SIZE(cmd);

					return copy_to_user(user_arg, hid->name, len) ?

					ret = copy_to_user(user_arg, hid->name, len) ?

						-EFAULT : len;

					break;

				}



				if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) {
@@ -288,8 +291,9 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, 
					len = strlen(hid->phys) + 1;

					if (len > _IOC_SIZE(cmd))

						len = _IOC_SIZE(cmd);

					return copy_to_user(user_arg, hid->phys, len) ?

					ret = copy_to_user(user_arg, hid->phys, len) ?

						-EFAULT : len;

					break;

				}

                }