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

Commit e9036d06 authored Feb 05, 2016 by Peter Hurley Committed by Greg Kroah-Hartman Feb 06, 2016

tty: Drop krefs for interrupted tty lock



When the tty lock is interrupted on attempted re-open, 2 tty krefs
are still held. Drop extra kref before returning failure from
tty_lock_interruptible(), and drop lookup kref before returning
failure from tty_open().

Fixes: 0bfd464d ("tty: Wait interruptibly for tty lock on reopen")
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 36f90b0a

drivers/tty/tty_io.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2066,13 +2066,12 @@ static int tty_open(struct inode inode, struct file filp)
		if (tty) {
		mutex_unlock(&tty_mutex);
		retval = tty_lock_interruptible(tty);
		tty_kref_put(tty); /* drop kref from tty_driver_lookup_tty() */
		if (retval) {
		if (retval == -EINTR)
		retval = -ERESTARTSYS;
		goto err_unref;
		}
		/* safe to drop the kref from tty_driver_lookup_tty() */
		tty_kref_put(tty);
		retval = tty_reopen(tty);
		if (retval < 0) {
		tty_unlock(tty);

drivers/tty/tty_mutex.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -21,10 +21,15 @@ EXPORT_SYMBOL(tty_lock);

		int tty_lock_interruptible(struct tty_struct *tty)
		{
		int ret;

		if (WARN(tty->magic != TTY_MAGIC, "L Bad %p\n", tty))
		return -EIO;
		tty_kref_get(tty);
		return mutex_lock_interruptible(&tty->legacy_mutex);
		ret = mutex_lock_interruptible(&tty->legacy_mutex);
		if (ret)
		tty_kref_put(tty);
		return ret;
		}

		void __lockfunc tty_unlock(struct tty_struct *tty)