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

Commit cbe01f72 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: comedi_fops: rename the __user *cmd param in do_cmd_ioctl 



This parameter is actually the unsigned long arg passed in the ioctl.
comedi_unlocked_ioctl() casts it as a (struct comedi_cmd __user *)
when calling do_cmd_ioctl(). Rename the variable to keep this clear.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Acked-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9be56c64

drivers/staging/comedi/comedi_fops.c

+3 −3
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ static void comedi_set_subdevice_runflags(struct comedi_subdevice *s, 
}



static int do_cmd_ioctl(struct comedi_device *dev,

			struct comedi_cmd __user *cmd, void *file)

			struct comedi_cmd __user *arg, void *file)

{

	struct comedi_cmd user_cmd;

	struct comedi_subdevice *s;
@@ -1139,7 +1139,7 @@ static int do_cmd_ioctl(struct comedi_device *dev, 
	int ret = 0;

	unsigned int __user *chanlist_saver = NULL;



	if (copy_from_user(&user_cmd, cmd, sizeof(struct comedi_cmd))) {

	if (copy_from_user(&user_cmd, arg, sizeof(struct comedi_cmd))) {

		DPRINTK("bad cmd address\n");

		return -EFAULT;

	}
@@ -1230,7 +1230,7 @@ static int do_cmd_ioctl(struct comedi_device *dev, 
		/* restore chanlist pointer before copying back */

		user_cmd.chanlist = chanlist_saver;

		user_cmd.data = NULL;

		if (copy_to_user(cmd, &user_cmd, sizeof(struct comedi_cmd))) {

		if (copy_to_user(arg, &user_cmd, sizeof(struct comedi_cmd))) {

			DPRINTK("fault writing cmd\n");

			ret = -EFAULT;

			goto cleanup;