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

Commit 72586c60 authored by Laura Abbott's avatar Laura Abbott Committed by Greg Kroah-Hartman
Browse files

n_tty: Fix auditing support for cannonical mode 



Commit 32f13521
("n_tty: Line copy to user buffer in canonical mode")
changed cannonical mode copying to use copy_to_user
but missed adding the call to the audit framework.
Add in the appropriate functions to get audit support.

Fixes: 32f13521 ("n_tty: Line copy to user buffer in canonical mode")
Reported-by: default avatarMiloslav Trmač <mitr@redhat.com>
Signed-off-by: default avatarLaura Abbott <labbott@fedoraproject.org>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9809889c

drivers/tty/n_tty.c

+14 −3
Original line number Diff line number Diff line
@@ -162,6 +162,17 @@ static inline int tty_put_user(struct tty_struct *tty, unsigned char x, 
	return put_user(x, ptr);

}



static inline int tty_copy_to_user(struct tty_struct *tty,

					void __user *to,

					const void *from,

					unsigned long n)

{

	struct n_tty_data *ldata = tty->disc_data;



	tty_audit_add_data(tty, to, n, ldata->icanon);

	return copy_to_user(to, from, n);

}



/**

 *	n_tty_kick_worker - start input worker (if required)

 *	@tty: terminal
@@ -2084,12 +2095,12 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, 
		    __func__, eol, found, n, c, size, more);



	if (n > size) {

		ret = copy_to_user(*b, read_buf_addr(ldata, tail), size);

		ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), size);

		if (ret)

			return -EFAULT;

		ret = copy_to_user(*b + size, ldata->read_buf, n - size);

		ret = tty_copy_to_user(tty, *b + size, ldata->read_buf, n - size);

	} else

		ret = copy_to_user(*b, read_buf_addr(ldata, tail), n);

		ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), n);



	if (ret)

		return -EFAULT;