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

Commit 89c8d91e authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

tty: localise the lock 



The termios and other changes mean the other protections needed on the driver
tty arrays should be adequate. Turn it all back on.

This contains pieces folded in from the fixes made to the original patches

| From: Geert Uytterhoeven <geert@linux-m68k.org>	(fix m68k)
| From: Paul Gortmaker <paul.gortmaker@windriver.com>	(fix cris)
| From: Jiri Kosina <jkosina@suze.cz>			(lockdep)
| From: Eric Dumazet <eric.dumazet@gmail.com>		(lockdep)

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc6802a7

drivers/tty/amiserial.c

+7 −7
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ static int get_serial_info(struct tty_struct *tty, struct serial_state *state, 
	if (!retinfo)

		return -EFAULT;

	memset(&tmp, 0, sizeof(tmp));

	tty_lock();

	tty_lock(tty);

	tmp.line = tty->index;

	tmp.port = state->port;

	tmp.flags = state->tport.flags;
@@ -1042,7 +1042,7 @@ static int get_serial_info(struct tty_struct *tty, struct serial_state *state, 
	tmp.close_delay = state->tport.close_delay;

	tmp.closing_wait = state->tport.closing_wait;

	tmp.custom_divisor = state->custom_divisor;

	tty_unlock();

	tty_unlock(tty);

	if (copy_to_user(retinfo,&tmp,sizeof(*retinfo)))

		return -EFAULT;

	return 0;
@@ -1059,12 +1059,12 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state, 
	if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))

		return -EFAULT;



	tty_lock();

	tty_lock(tty);

	change_spd = ((new_serial.flags ^ port->flags) & ASYNC_SPD_MASK) ||

		new_serial.custom_divisor != state->custom_divisor;

	if (new_serial.irq || new_serial.port != state->port ||

			new_serial.xmit_fifo_size != state->xmit_fifo_size) {

		tty_unlock();

		tty_unlock(tty);

		return -EINVAL;

	}
@@ -1074,7 +1074,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state, 
		    (new_serial.xmit_fifo_size != state->xmit_fifo_size) ||

		    ((new_serial.flags & ~ASYNC_USR_MASK) !=

		     (port->flags & ~ASYNC_USR_MASK))) {

			tty_unlock();

			tty_unlock(tty);

			return -EPERM;

		}

		port->flags = ((port->flags & ~ASYNC_USR_MASK) |
@@ -1084,7 +1084,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state, 
	}



	if (new_serial.baud_base < 9600) {

		tty_unlock();

		tty_unlock(tty);

		return -EINVAL;

	}
@@ -1116,7 +1116,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state, 
		}

	} else

		retval = startup(tty, state);

	tty_unlock();

	tty_unlock(tty);

	return retval;

}

drivers/tty/cyclades.c

+1 −1
Original line number Diff line number Diff line
@@ -1599,7 +1599,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp) 
	 * If the port is the middle of closing, bail out now

	 */

	if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {

		wait_event_interruptible_tty(info->port.close_wait,

		wait_event_interruptible_tty(tty, info->port.close_wait,

				!(info->port.flags & ASYNC_CLOSING));

		return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;

	}

drivers/tty/n_r3964.c

+5 −5
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file, 


	TRACE_L("read()");



	tty_lock();

	tty_lock(tty);



	pClient = findClient(pInfo, task_pid(current));

	if (pClient) {
@@ -1077,7 +1077,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file, 
				goto unlock;

			}

			/* block until there is a message: */

			wait_event_interruptible_tty(pInfo->read_wait,

			wait_event_interruptible_tty(tty, pInfo->read_wait,

					(pMsg = remove_msg(pInfo, pClient)));

		}
@@ -1107,7 +1107,7 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file, 
	}

	ret = -EPERM;

unlock:

	tty_unlock();

	tty_unlock(tty);

	return ret;

}
@@ -1156,7 +1156,7 @@ static ssize_t r3964_write(struct tty_struct *tty, struct file *file, 
	pHeader->locks = 0;

	pHeader->owner = NULL;



	tty_lock();

	tty_lock(tty);



	pClient = findClient(pInfo, task_pid(current));

	if (pClient) {
@@ -1175,7 +1175,7 @@ static ssize_t r3964_write(struct tty_struct *tty, struct file *file, 
	add_tx_queue(pInfo, pHeader);

	trigger_transmit(pInfo);



	tty_unlock();

	tty_unlock(tty);



	return 0;

}

drivers/tty/pty.c

+14 −11
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static void pty_close(struct tty_struct *tty, struct file *filp) 
	wake_up_interruptible(&tty->read_wait);

	wake_up_interruptible(&tty->write_wait);

	tty->packet = 0;

	/* Review - krefs on tty_link ?? */

	if (!tty->link)

		return;

	tty->link->packet = 0;
@@ -62,9 +63,9 @@ static void pty_close(struct tty_struct *tty, struct file *filp) 
		        mutex_unlock(&devpts_mutex);

		}

#endif

		tty_unlock();

		tty_unlock(tty);

		tty_vhangup(tty->link);

		tty_lock();

		tty_lock(tty);

	}

}
@@ -617,26 +618,27 @@ static int ptmx_open(struct inode *inode, struct file *filp) 
		return retval;



	/* find a device that is not in use. */

	tty_lock();

	mutex_lock(&devpts_mutex);

	index = devpts_new_index(inode);

	tty_unlock();

	if (index < 0) {

		retval = index;

		goto err_file;

	}



	mutex_unlock(&devpts_mutex);



	mutex_lock(&tty_mutex);

	mutex_lock(&devpts_mutex);

	tty = tty_init_dev(ptm_driver, index);

	mutex_unlock(&devpts_mutex);

	tty_lock();

	mutex_unlock(&tty_mutex);



	if (IS_ERR(tty)) {

		retval = PTR_ERR(tty);

		goto out;

	}



	/* The tty returned here is locked so we can safely

	   drop the mutex */

	mutex_unlock(&tty_mutex);



	set_bit(TTY_PTY_LOCK, &tty->flags); /* LOCK THE SLAVE */



	tty_add_file(tty, filp);
@@ -649,16 +651,17 @@ static int ptmx_open(struct inode *inode, struct file *filp) 
	if (retval)

		goto err_release;



	tty_unlock();

	tty_unlock(tty);

	return 0;

err_release:

	tty_unlock();

	tty_unlock(tty);

	tty_release(inode, filp);

	return retval;

out:

	mutex_unlock(&tty_mutex);

	devpts_kill_index(inode, index);

	tty_unlock();

err_file:

        mutex_unlock(&devpts_mutex);

	tty_free_file(filp);

	return retval;

}

drivers/tty/serial/crisv10.c

+4 −4
Original line number Diff line number Diff line
@@ -3976,7 +3976,7 @@ block_til_ready(struct tty_struct *tty, struct file * filp, 
	 */

	if (tty_hung_up_p(filp) ||

	    (info->flags & ASYNC_CLOSING)) {

		wait_event_interruptible_tty(info->close_wait,

		wait_event_interruptible_tty(tty, info->close_wait,

			!(info->flags & ASYNC_CLOSING));

#ifdef SERIAL_DO_RESTART

		if (info->flags & ASYNC_HUP_NOTIFY)
@@ -4052,9 +4052,9 @@ block_til_ready(struct tty_struct *tty, struct file * filp, 
		printk("block_til_ready blocking: ttyS%d, count = %d\n",

		       info->line, info->count);

#endif

		tty_unlock();

		tty_unlock(tty);

		schedule();

		tty_lock();

		tty_lock(tty);

	}

	set_current_state(TASK_RUNNING);

	remove_wait_queue(&info->open_wait, &wait);
@@ -4115,7 +4115,7 @@ rs_open(struct tty_struct *tty, struct file * filp) 
	 */

	if (tty_hung_up_p(filp) ||

	    (info->flags & ASYNC_CLOSING)) {

		wait_event_interruptible_tty(info->close_wait,

		wait_event_interruptible_tty(tty, info->close_wait,

			!(info->flags & ASYNC_CLOSING));

#ifdef SERIAL_DO_RESTART

		return ((info->flags & ASYNC_HUP_NOTIFY) ?