HID: Consolidate device existence checks in hiddev_ioctl (33d6eb57) · Commits · e / devices / android_kernel_teracube_emerald

drivers/hid/usbhid/hiddev.c

+103 −184

Original line number	Original line	Diff line number	Diff line
	@@ -587,29 +587,17 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
	struct hiddev_list *list = file->private_data;		struct hiddev_list *list = file->private_data;
	struct hiddev *hiddev = list->hiddev;		struct hiddev *hiddev = list->hiddev;
	struct hid_device *hid;		struct hid_device *hid;
	struct usb_device *dev;
	struct hiddev_collection_info cinfo;		struct hiddev_collection_info cinfo;
	struct hiddev_report_info rinfo;		struct hiddev_report_info rinfo;
	struct hiddev_field_info finfo;		struct hiddev_field_info finfo;
	struct hiddev_devinfo dinfo;		struct hiddev_devinfo dinfo;
	struct hid_report *report;		struct hid_report *report;
	struct hid_field *field;		struct hid_field *field;
	struct usbhid_device *usbhid;
	void __user user_arg = (void __user )arg;		void __user user_arg = (void __user )arg;
	int i, r;		int i, r = -EINVAL;

	/* Called without BKL by compat methods so no BKL taken */		/* Called without BKL by compat methods so no BKL taken */

	/* FIXME: Who or what stop this racing with a disconnect ?? */
	if (!hiddev->exist)
	return -EIO;

	switch (cmd) {

	case HIDIOCGVERSION:
	return put_user(HID_VERSION, (int __user *)arg);

	case HIDIOCAPPLICATION:
	mutex_lock(&hiddev->existancelock);		mutex_lock(&hiddev->existancelock);
	if (!hiddev->exist) {		if (!hiddev->exist) {
	r = -ENODEV;		r = -ENODEV;
	@@ -617,32 +605,31 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
	}		}

	hid = hiddev->hid;		hid = hiddev->hid;
	if (arg < 0 \|\| arg >= hid->maxapplication) {
	r = -EINVAL;		switch (cmd) {
	goto ret_unlock;
	}		case HIDIOCGVERSION:
			r = put_user(HID_VERSION, (int __user *)arg) ?
			-EFAULT : 0;
			break;

			case HIDIOCAPPLICATION:
			if (arg < 0 \|\| arg >= hid->maxapplication)
			break;

	for (i = 0; i < hid->maxcollection; i++)		for (i = 0; i < hid->maxcollection; i++)
	if (hid->collection[i].type ==		if (hid->collection[i].type ==
	HID_COLLECTION_APPLICATION && arg-- == 0)		HID_COLLECTION_APPLICATION && arg-- == 0)
	break;		break;

	if (i == hid->maxcollection)		if (i < hid->maxcollection)
	r = -EINVAL;
	else
	r = hid->collection[i].usage;		r = hid->collection[i].usage;
	goto ret_unlock;		break;

	case HIDIOCGDEVINFO:		case HIDIOCGDEVINFO:
	mutex_lock(&hiddev->existancelock);		{
	if (!hiddev->exist) {		struct usb_device *dev = hid_to_usb_dev(hid);
	r = -ENODEV;		struct usbhid_device *usbhid = hid->driver_data;
	goto ret_unlock;
	}

	hid = hiddev->hid;
	dev = hid_to_usb_dev(hid);
	usbhid = hid->driver_data;

	dinfo.bustype = BUS_USB;		dinfo.bustype = BUS_USB;
	dinfo.busnum = dev->bus->busnum;		dinfo.busnum = dev->bus->busnum;
	@@ -652,156 +639,115 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
	dinfo.product = le16_to_cpu(dev->descriptor.idProduct);		dinfo.product = le16_to_cpu(dev->descriptor.idProduct);
	dinfo.version = le16_to_cpu(dev->descriptor.bcdDevice);		dinfo.version = le16_to_cpu(dev->descriptor.bcdDevice);
	dinfo.num_applications = hid->maxapplication;		dinfo.num_applications = hid->maxapplication;
	mutex_unlock(&hiddev->existancelock);

	if (copy_to_user(user_arg, &dinfo, sizeof(dinfo)))		r = copy_to_user(user_arg, &dinfo, sizeof(dinfo)) ?
	return -EFAULT;		-EFAULT : 0;
			break;
	return 0;		}

	case HIDIOCGFLAG:		case HIDIOCGFLAG:
	if (put_user(list->flags, (int __user *)arg))		r = put_user(list->flags, (int __user *)arg) ?
	return -EFAULT;		-EFAULT : 0;
			break;
	return 0;

	case HIDIOCSFLAG:		case HIDIOCSFLAG:
	{		{
	int newflags;		int newflags;
	if (get_user(newflags, (int __user *)arg))
	return -EFAULT;		if (get_user(newflags, (int __user *)arg)) {
			r = -EFAULT;
			break;
			}

	if ((newflags & ~HIDDEV_FLAGS) != 0 \|\|		if ((newflags & ~HIDDEV_FLAGS) != 0 \|\|
	((newflags & HIDDEV_FLAG_REPORT) != 0 &&		((newflags & HIDDEV_FLAG_REPORT) != 0 &&
	(newflags & HIDDEV_FLAG_UREF) == 0))		(newflags & HIDDEV_FLAG_UREF) == 0))
	return -EINVAL;		break;

	list->flags = newflags;		list->flags = newflags;

	return 0;		r = 0;
			break;
	}		}

	case HIDIOCGSTRING:		case HIDIOCGSTRING:
	mutex_lock(&hiddev->existancelock);
	if (hiddev->exist)
	r = hiddev_ioctl_string(hiddev, cmd, user_arg);		r = hiddev_ioctl_string(hiddev, cmd, user_arg);
	else		break;
	r = -ENODEV;
	ret_unlock:
	mutex_unlock(&hiddev->existancelock);
	return r;

	case HIDIOCINITREPORT:		case HIDIOCINITREPORT:
	mutex_lock(&hiddev->existancelock);
	if (!hiddev->exist) {
	mutex_unlock(&hiddev->existancelock);
	return -ENODEV;
	}
	hid = hiddev->hid;
	usbhid_init_reports(hid);		usbhid_init_reports(hid);
	mutex_unlock(&hiddev->existancelock);		r = 0;
			break;
	return 0;

	case HIDIOCGREPORT:		case HIDIOCGREPORT:
	if (copy_from_user(&rinfo, user_arg, sizeof(rinfo)))		if (copy_from_user(&rinfo, user_arg, sizeof(rinfo))) {
	return -EFAULT;		r = -EFAULT;
			break;
			}

	if (rinfo.report_type == HID_REPORT_TYPE_OUTPUT)		if (rinfo.report_type == HID_REPORT_TYPE_OUTPUT)
	return -EINVAL;		break;

	mutex_lock(&hiddev->existancelock);
	if (!hiddev->exist) {
	r = -ENODEV;
	goto ret_unlock;
	}

	hid = hiddev->hid;
	report = hiddev_lookup_report(hid, &rinfo);		report = hiddev_lookup_report(hid, &rinfo);
	if (report == NULL) {		if (report == NULL)
	r = -EINVAL;		break;
	goto ret_unlock;
	}

	usbhid_submit_report(hid, report, USB_DIR_IN);		usbhid_submit_report(hid, report, USB_DIR_IN);
	usbhid_wait_io(hid);		usbhid_wait_io(hid);
	mutex_unlock(&hiddev->existancelock);

	return 0;		r = 0;
			break;

	case HIDIOCSREPORT:		case HIDIOCSREPORT:
	if (copy_from_user(&rinfo, user_arg, sizeof(rinfo)))		if (copy_from_user(&rinfo, user_arg, sizeof(rinfo))) {
	return -EFAULT;		r = -EFAULT;
			break;
			}

	if (rinfo.report_type == HID_REPORT_TYPE_INPUT)		if (rinfo.report_type == HID_REPORT_TYPE_INPUT)
	return -EINVAL;		break;

	mutex_lock(&hiddev->existancelock);
	if (!hiddev->exist) {
	r = -ENODEV;
	goto ret_unlock;
	}

	hid = hiddev->hid;
	report = hiddev_lookup_report(hid, &rinfo);		report = hiddev_lookup_report(hid, &rinfo);
	if (report == NULL) {		if (report == NULL)
	r = -EINVAL;		break;
	goto ret_unlock;
	}

	usbhid_submit_report(hid, report, USB_DIR_OUT);		usbhid_submit_report(hid, report, USB_DIR_OUT);
	usbhid_wait_io(hid);		usbhid_wait_io(hid);
	mutex_unlock(&hiddev->existancelock);

	return 0;		r = 0;
			break;

	case HIDIOCGREPORTINFO:		case HIDIOCGREPORTINFO:
	if (copy_from_user(&rinfo, user_arg, sizeof(rinfo)))		if (copy_from_user(&rinfo, user_arg, sizeof(rinfo))) {
	return -EFAULT;		r = -EFAULT;
			break;
	mutex_lock(&hiddev->existancelock);
	if (!hiddev->exist) {
	r = -ENODEV;
	goto ret_unlock;
	}		}

	hid = hiddev->hid;
	report = hiddev_lookup_report(hid, &rinfo);		report = hiddev_lookup_report(hid, &rinfo);
	if (report == NULL) {		if (report == NULL)
	r = -EINVAL;		break;
	goto ret_unlock;
	}

	rinfo.num_fields = report->maxfield;		rinfo.num_fields = report->maxfield;
	mutex_unlock(&hiddev->existancelock);

	if (copy_to_user(user_arg, &rinfo, sizeof(rinfo)))
	return -EFAULT;

	return 0;		r = copy_to_user(user_arg, &rinfo, sizeof(rinfo)) ?
			-EFAULT : 0;
			break;

	case HIDIOCGFIELDINFO:		case HIDIOCGFIELDINFO:
	if (copy_from_user(&finfo, user_arg, sizeof(finfo)))		if (copy_from_user(&finfo, user_arg, sizeof(finfo))) {
	return -EFAULT;		r = -EFAULT;
			break;
			}

	rinfo.report_type = finfo.report_type;		rinfo.report_type = finfo.report_type;
	rinfo.report_id = finfo.report_id;		rinfo.report_id = finfo.report_id;
	mutex_lock(&hiddev->existancelock);
	if (!hiddev->exist) {
	r = -ENODEV;
	goto ret_unlock;
	}

	hid = hiddev->hid;
	report = hiddev_lookup_report(hid, &rinfo);		report = hiddev_lookup_report(hid, &rinfo);
	if (report == NULL) {		if (report == NULL)
	r = -EINVAL;		break;
	goto ret_unlock;
	}

	if (finfo.field_index >= report->maxfield) {		if (finfo.field_index >= report->maxfield)
	r = -EINVAL;		break;
	goto ret_unlock;
	}

	field = report->field[finfo.field_index];		field = report->field[finfo.field_index];
	memset(&finfo, 0, sizeof(finfo));		memset(&finfo, 0, sizeof(finfo));
	@@ -819,12 +765,10 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
	finfo.physical_maximum = field->physical_maximum;		finfo.physical_maximum = field->physical_maximum;
	finfo.unit_exponent = field->unit_exponent;		finfo.unit_exponent = field->unit_exponent;
	finfo.unit = field->unit;		finfo.unit = field->unit;
	mutex_unlock(&hiddev->existancelock);

	if (copy_to_user(user_arg, &finfo, sizeof(finfo)))
	return -EFAULT;

	return 0;		r = copy_to_user(user_arg, &finfo, sizeof(finfo)) ?
			-EFAULT : 0;
			break;

	case HIDIOCGUCODE:		case HIDIOCGUCODE:
	/* fall through */		/* fall through */
	@@ -833,57 +777,36 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
	case HIDIOCGUSAGES:		case HIDIOCGUSAGES:
	case HIDIOCSUSAGES:		case HIDIOCSUSAGES:
	case HIDIOCGCOLLECTIONINDEX:		case HIDIOCGCOLLECTIONINDEX:
	mutex_lock(&hiddev->existancelock);
	if (hiddev->exist)
	r = hiddev_ioctl_usage(hiddev, cmd, user_arg);		r = hiddev_ioctl_usage(hiddev, cmd, user_arg);
	else		break;
	r = -ENODEV;
	mutex_unlock(&hiddev->existancelock);
	return r;

	case HIDIOCGCOLLECTIONINFO:		case HIDIOCGCOLLECTIONINFO:
	if (copy_from_user(&cinfo, user_arg, sizeof(cinfo)))		if (copy_from_user(&cinfo, user_arg, sizeof(cinfo))) {
	return -EFAULT;		r = -EFAULT;
			break;
	mutex_lock(&hiddev->existancelock);
	if (!hiddev->exist) {
	r = -ENODEV;
	goto ret_unlock;
	}		}

	hid = hiddev->hid;		if (cinfo.index >= hid->maxcollection)
	if (cinfo.index >= hid->maxcollection) {		break;
	r = -EINVAL;
	goto ret_unlock;
	}

	cinfo.type = hid->collection[cinfo.index].type;		cinfo.type = hid->collection[cinfo.index].type;
	cinfo.usage = hid->collection[cinfo.index].usage;		cinfo.usage = hid->collection[cinfo.index].usage;
	cinfo.level = hid->collection[cinfo.index].level;		cinfo.level = hid->collection[cinfo.index].level;
	mutex_lock(&hiddev->existancelock);

	if (copy_to_user(user_arg, &cinfo, sizeof(cinfo)))		r = copy_to_user(user_arg, &cinfo, sizeof(cinfo)) ?
	return -EFAULT;		-EFAULT : 0;
	return 0;		break;

	default:		default:

	if (_IOC_TYPE(cmd) != 'H' \|\| _IOC_DIR(cmd) != _IOC_READ)		if (_IOC_TYPE(cmd) != 'H' \|\| _IOC_DIR(cmd) != _IOC_READ)
	return -EINVAL;		break;

	if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) {		if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGNAME(0))) {
	int len;		int len;

	mutex_lock(&hiddev->existancelock);
	if (!hiddev->exist) {
	r = -ENODEV;
	goto ret_unlock;
	}

	hid = hiddev->hid;
	if (!hid->name) {		if (!hid->name) {
	r = 0;		r = 0;
	goto ret_unlock;		break;
	}		}

	len = strlen(hid->name) + 1;		len = strlen(hid->name) + 1;
	@@ -891,22 +814,15 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
	len = _IOC_SIZE(cmd);		len = _IOC_SIZE(cmd);
	r = copy_to_user(user_arg, hid->name, len) ?		r = copy_to_user(user_arg, hid->name, len) ?
	-EFAULT : len;		-EFAULT : len;
	goto ret_unlock;		break;
	}		}

	if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) {		if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGPHYS(0))) {
	int len;		int len;

	mutex_lock(&hiddev->existancelock);
	if (!hiddev->exist) {
	r = -ENODEV;
	goto ret_unlock;
	}

	hid = hiddev->hid;
	if (!hid->phys) {		if (!hid->phys) {
	r = 0;		r = 0;
	goto ret_unlock;		break;
	}		}

	len = strlen(hid->phys) + 1;		len = strlen(hid->phys) + 1;
	@@ -914,10 +830,13 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
	len = _IOC_SIZE(cmd);		len = _IOC_SIZE(cmd);
	r = copy_to_user(user_arg, hid->phys, len) ?		r = copy_to_user(user_arg, hid->phys, len) ?
	-EFAULT : len;		-EFAULT : len;
	goto ret_unlock;		break;
	}		}
	}		}
	return -EINVAL;
			ret_unlock:
			mutex_unlock(&hiddev->existancelock);
			return r;
	}		}

	#ifdef CONFIG_COMPAT		#ifdef CONFIG_COMPAT