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

Commit 95ea90db authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

n_tty: Only process packet mode data in raw mode 



Packet mode can only be set for a pty master, and a pty master is
always in raw mode since its termios cannot be changed.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Reviewed-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1aa1bf11

drivers/tty/n_tty.c

+11 −10
Original line number Diff line number Diff line
@@ -2228,6 +2228,16 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, 
		}

		__set_current_state(TASK_RUNNING);



		if (ldata->icanon && !L_EXTPROC(tty)) {

			retval = canon_copy_from_read_buf(tty, &b, &nr);

			if (retval == -EAGAIN) {

				retval = 0;

				continue;

			} else if (retval)

				break;

		} else {

			int uncopied;



			/* Deal with packet mode. */

			if (packet && b == buf) {

				if (tty_put_user(tty, TIOCPKT_DATA, b++)) {
@@ -2238,15 +2248,6 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file, 
				nr--;

			}



		if (ldata->icanon && !L_EXTPROC(tty)) {

			retval = canon_copy_from_read_buf(tty, &b, &nr);

			if (retval == -EAGAIN) {

				retval = 0;

				continue;

			} else if (retval)

				break;

		} else {

			int uncopied;

			/* The copy function takes the read lock and handles

			   locking internally for this case */

			uncopied = copy_from_read_buf(tty, &b, &nr);