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

Commit f753f327 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

tty: TIOCGSOFTCAR/SSOFTCAR on pty is wron 



The termios settings ioctls on a pty should affect the bound tty side not
the pty. The SOFTCAR ioctls use the wrong device file.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 325a9a3d

drivers/char/tty_ioctl.c

+4 −2
Original line number Diff line number Diff line
@@ -937,12 +937,14 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file, 
			return 0;

#endif

	case TIOCGSOFTCAR:

		return put_user(C_CLOCAL(tty) ? 1 : 0,

		/* FIXME: for correctness we may need to take the termios

		   lock here - review */

		return put_user(C_CLOCAL(real_tty) ? 1 : 0,

						(int __user *)arg);

	case TIOCSSOFTCAR:

		if (get_user(arg, (unsigned int __user *) arg))

			return -EFAULT;

		return tty_change_softcar(tty, arg);

		return tty_change_softcar(real_tty, arg);

	default:

		return -ENOIOCTLCMD;

	}