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

Commit 1e86b5bf authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: core: Use correct spinlock flavor in tiocspgrp() 



tiocspgrp() is the ioctl handler for TIOCSPGRP, which runs in
non-atomic context; use spin_lock/unlock_irq (since interrupt state
is on).

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2812d9e9

drivers/tty/tty_io.c

+2 −3
Original line number Diff line number Diff line
@@ -2571,7 +2571,6 @@ static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t 
	struct pid *pgrp;

	pid_t pgrp_nr;

	int retval = tty_check_change(real_tty);

	unsigned long flags;



	if (retval == -EIO)

		return -ENOTTY;
@@ -2594,10 +2593,10 @@ static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t 
	if (session_of_pgrp(pgrp) != task_session(current))

		goto out_unlock;

	retval = 0;

	spin_lock_irqsave(&tty->ctrl_lock, flags);

	spin_lock_irq(&tty->ctrl_lock);

	put_pid(real_tty->pgrp);

	real_tty->pgrp = get_pid(pgrp);

	spin_unlock_irqrestore(&tty->ctrl_lock, flags);

	spin_unlock_irq(&tty->ctrl_lock);

out_unlock:

	rcu_read_unlock();

	return retval;