lkml.org 
[lkml]   [2016]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 076/117] tty: Fix unsafe ldisc reference via ioctl(TIOCGETD)
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Peter Hurley <peter@hurleysoftware.com>

    commit 5c17c861a357e9458001f021a7afa7aab9937439 upstream.

    ioctl(TIOCGETD) retrieves the line discipline id directly from the
    ldisc because the line discipline id (c_line) in termios is untrustworthy;
    userspace may have set termios via ioctl(TCSETS*) without actually
    changing the line discipline via ioctl(TIOCSETD).

    However, directly accessing the current ldisc via tty->ldisc is
    unsafe; the ldisc ptr dereferenced may be stale if the line discipline
    is changing via ioctl(TIOCSETD) or hangup.

    Wait for the line discipline reference (just like read() or write())
    to retrieve the "current" line discipline id.

    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tty/tty_io.c | 24 +++++++++++++++++++++++-
    1 file changed, 23 insertions(+), 1 deletion(-)

    --- a/drivers/tty/tty_io.c
    +++ b/drivers/tty/tty_io.c
    @@ -2663,6 +2663,28 @@ static int tiocsetd(struct tty_struct *t
    }

    /**
    + * tiocgetd - get line discipline
    + * @tty: tty device
    + * @p: pointer to user data
    + *
    + * Retrieves the line discipline id directly from the ldisc.
    + *
    + * Locking: waits for ldisc reference (in case the line discipline
    + * is changing or the tty is being hungup)
    + */
    +
    +static int tiocgetd(struct tty_struct *tty, int __user *p)
    +{
    + struct tty_ldisc *ld;
    + int ret;
    +
    + ld = tty_ldisc_ref_wait(tty);
    + ret = put_user(ld->ops->num, p);
    + tty_ldisc_deref(ld);
    + return ret;
    +}
    +
    +/**
    * send_break - performed time break
    * @tty: device to break on
    * @duration: timeout in mS
    @@ -2888,7 +2910,7 @@ long tty_ioctl(struct file *file, unsign
    case TIOCGSID:
    return tiocgsid(tty, real_tty, p);
    case TIOCGETD:
    - return put_user(tty->ldisc->ops->num, (int __user *)p);
    + return tiocgetd(tty, p);
    case TIOCSETD:
    return tiocsetd(tty, p);
    case TIOCVHANGUP:

    \
     
     \ /
      Last update: 2016-02-15 02:01    [W:2.026 / U:1.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site