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

Commit bbb63c51 authored by Wanlong Gao's avatar Wanlong Gao Committed by Greg Kroah-Hartman
Browse files

drivers:tty:fix up ENOIOCTLCMD error handling 



At commit 07d106d0, Linus pointed out that ENOIOCTLCMD should be
translated as ENOTTY to user mode.
For example:
	fd = open("/dev/tty", O_RDWR);
	ioctl(fd, -1, &argp);

then the errno should be ENOTTY but not EINVAL.

Signed-off-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd7c81f8

drivers/tty/tty_io.c

+1 −1
Original line number Diff line number Diff line
@@ -2774,7 +2774,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	if (ld->ops->ioctl) {

		retval = ld->ops->ioctl(tty, file, cmd, arg);

		if (retval == -ENOIOCTLCMD)

			retval = -EINVAL;

			retval = -ENOTTY;

	}

	tty_ldisc_deref(ld);

	return retval;