tty: pty: Fix race condition between release_one_tty and pty_write
PATCH 1/1 tty: pty: Fix race condition between release_one_tty and pty_write
From: Sahara <[email protected]>
Especially when a linked tty is used such as pty, the linked tty port's buf works have not been cancelled while master tty port's buf work has been cancelled. Since release_one_tty and flush_to_ldisc run in workqueue threads separately, when pty_cleanup happens and link tty port is freed, flush_to_ldisc tries to access freed port and port->itty, eventually it causes a panic.
This patch utilizes the magic value with holding the tty_mutex to check if the tty->link is valid.
--- drivers/tty/pty.c | 7 +++++++ drivers/tty/tty_io.c | 3 +++ 2 files changed, 10 insertions(+)
drivers/tty/pty.c +7 -0
@@ -116,6 +116,12 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)if (tty->stopped)return 0 ; +mutex_lock (&tty_mutex); +if (to->magic !=TTY_MAGIC ) { +mutex_unlock (&tty_mutex); +return -EIO ; + } +if (c >0 ) {spin_lock_irqsave (&to->port->lock, flags);/* Stuff the data into the input queue of the other end */
@@ -125,6 +131,7 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)tty_flip_buffer_push (to->port);spin_unlock_irqrestore (&to->port->lock, flags); } +mutex_unlock (&tty_mutex);return c; }
drivers/tty/tty_io.c +3 -0
@@ -1446,10 +1446,13 @@ static void release_one_tty(struct work_struct *work)struct tty_driver *driver = tty->driver;struct module *owner = driver->owner; +mutex_lock (&tty_mutex);if (tty->ops->cleanup) tty->ops->cleanup (tty); tty->magic =0 ; +mutex_unlock (&tty_mutex); +tty_driver_kref_put (driver);module_put (owner);
Signature · 1 line
2.7.4
Greg KH
maintainerQuoted 1 line · On Mon, Feb 11, 2019 at 11:09:15AM +0400, [email protected] wrote:
From: Sahara <[email protected]>
I need a "real" name here, one you use to sign legal documents please.
Quoted 21 lines
Especially when a linked tty is used such as pty, the linked tty port's buf works have not been cancelled while master tty port's buf work has been cancelled. Since
release_one_ttyandflush_to_ldiscrun in workqueue threads separately, whenpty_cleanuphappens and link tty port is freed,flush_to_ldisctries to access freed port andport->itty, eventually it causes a panic.
This patch utilizes the magic value with holding thetty_mutexto check if thetty->linkis valid.Fixes 2b022ab7542d ("pty: cancel pty slave port buf's work in tty_release")Signed-off-by Sahara <[email protected]>--- drivers/tty/pty.c | 7 +++++++ drivers/tty/tty_io.c | 3 +++ 2 files changed, 10 insertions(+)drivers/tty/pty.c +0
-0
drivers/tty/pty.c static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c) · line 120
Quoted 5 lines
drivers/tty/pty.c +2
-0@@ -116,6 +116,12 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)if (tty->stopped)return 0 ; +mutex_lock (&tty_mutex); +if (to->magic !=TTY_MAGIC ) {
Checking the "magic" field is odd, are you sure about this? Usually this means that memory that is already freed is still being used, right?
And have you tried the 5.0-rc6 release? I thought I fixed much this same issue there already, but for a serial port, not a pty. Is the same problem still present?
Quoted 20 lines
drivers/tty/pty.c +5
-0+mutex_unlock (&tty_mutex); +return -EIO ; + } +if (c >0 ) {spin_lock_irqsave (&to->port->lock, flags);/* Stuff the data into the input queue of the other end */ @@ -125,6 +131,7 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)tty_flip_buffer_push (to->port);spin_unlock_irqrestore (&to->port->lock, flags); } +mutex_unlock (&tty_mutex);return c; }drivers/tty/tty_io.c +0
-0
drivers/tty/tty_io.c static void release_one_tty(struct work_struct *work) · line 1453
Quoted 8 lines
drivers/tty/tty_io.c +1
-0@@ -1446,10 +1446,13 @@ static void release_one_tty(struct work_struct *work)struct tty_driver *driver = tty->driver;struct module *owner = driver->owner; +mutex_lock (&tty_mutex);if (tty->ops->cleanup) tty->ops->cleanup (tty); tty->magic =0 ;
Using the "magic" field as a flag isn't the best thing for us to rely on, because this structure should be freed now, right?
thanks,
greg k-h