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

Commit 9b3ceae4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "tty: fix data race between tty_init_dev and flush of buf"

parents a02ac610 7f543476

drivers/tty/tty_io.c

+7 −1
Original line number Diff line number Diff line
@@ -1543,6 +1543,9 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx) 
			"%s: %s driver does not set tty->port. This will crash the kernel later. Fix the driver!\n",

			__func__, tty->driver->name);



	retval = tty_ldisc_lock(tty, 5 * HZ);

	if (retval)

		goto err_release_lock;

	tty->port->itty = tty;



	/*
@@ -1553,6 +1556,7 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx) 
	retval = tty_ldisc_setup(tty, tty->link);

	if (retval)

		goto err_release_tty;

	tty_ldisc_unlock(tty);

	/* Return the tty locked so that it cannot vanish under the caller */

	return tty;
@@ -1565,9 +1569,11 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx) 


	/* call the tty release_tty routine to clean out this slot */

err_release_tty:

	tty_unlock(tty);

	tty_ldisc_unlock(tty);

	tty_info_ratelimited(tty, "ldisc open failed (%d), clearing slot %d\n",

			     retval, idx);

err_release_lock:

	tty_unlock(tty);

	release_tty(tty, idx);

	return ERR_PTR(retval);

}

drivers/tty/tty_ldisc.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static inline void __tty_ldisc_unlock(struct tty_struct *tty) 
	ldsem_up_write(&tty->ldisc_sem);

}



static int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)

int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout)

{

	int ret;
@@ -347,7 +347,7 @@ static int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout) 
	return 0;

}



static void tty_ldisc_unlock(struct tty_struct *tty)

void tty_ldisc_unlock(struct tty_struct *tty)

{

	clear_bit(TTY_LDISC_HALTED, &tty->flags);

	__tty_ldisc_unlock(tty);

include/linux/tty.h

+2 −0
Original line number Diff line number Diff line
@@ -394,6 +394,8 @@ extern struct tty_struct *get_current_tty(void); 
/* tty_io.c */

extern int __init tty_init(void);

extern const char *tty_name(const struct tty_struct *tty);

extern int tty_ldisc_lock(struct tty_struct *tty, unsigned long timeout);

extern void tty_ldisc_unlock(struct tty_struct *tty);

#else

static inline void console_init(void)

{ }