lkml.org 
[lkml]   [2014]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 05/23] tty: Set correct tty name in active sysfs attribute
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Hannes Reinecke <hare@suse.de>

    commit 723abd87f6e536f1353c8f64f621520bc29523a3 upstream.

    The 'active' sysfs attribute should refer to the currently active tty
    devices the console is running on, not the currently active console. The
    console structure doesn't refer to any device in sysfs, only the tty the
    console is running on has. So we need to print out the tty names in
    'active', not the console names.

    There is one special-case, which is tty0. If the console is directed to
    it, we want 'tty0' to show up in the file, so user-space knows that the
    messages get forwarded to the active VT. The ->device() callback would
    resolve tty0, though. Hence, treat it special and don't call into the VT
    layer to resolve it (plymouth is known to depend on it).

    Cc: Lennart Poettering <lennart@poettering.net>
    Cc: Kay Sievers <kay@vrfy.org>
    Cc: Jiri Slaby <jslaby@suse.cz>
    Signed-off-by: Werner Fink <werner@suse.de>
    Signed-off-by: Hannes Reinecke <hare@suse.de>
    Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tty/tty_io.c | 23 +++++++++++++++++------
    1 file changed, 17 insertions(+), 6 deletions(-)

    --- a/drivers/tty/tty_io.c
    +++ b/drivers/tty/tty_io.c
    @@ -1267,12 +1267,13 @@ static void pty_line_name(struct tty_dri
    *
    * Locking: None
    */
    -static void tty_line_name(struct tty_driver *driver, int index, char *p)
    +static ssize_t tty_line_name(struct tty_driver *driver, int index, char *p)
    {
    if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE)
    - strcpy(p, driver->name);
    + return sprintf(p, "%s", driver->name);
    else
    - sprintf(p, "%s%d", driver->name, index + driver->name_base);
    + return sprintf(p, "%s%d", driver->name,
    + index + driver->name_base);
    }

    /**
    @@ -3538,9 +3539,19 @@ static ssize_t show_cons_active(struct d
    if (i >= ARRAY_SIZE(cs))
    break;
    }
    - while (i--)
    - count += sprintf(buf + count, "%s%d%c",
    - cs[i]->name, cs[i]->index, i ? ' ':'\n');
    + while (i--) {
    + int index = cs[i]->index;
    + struct tty_driver *drv = cs[i]->device(cs[i], &index);
    +
    + /* don't resolve tty0 as some programs depend on it */
    + if (drv && (cs[i]->index > 0 || drv->major != TTY_MAJOR))
    + count += tty_line_name(drv, index, buf + count);
    + else
    + count += sprintf(buf + count, "%s%d",
    + cs[i]->name, cs[i]->index);
    +
    + count += sprintf(buf + count, "%c", i ? ' ':'\n');
    + }
    console_unlock();

    return count;



    \
     
     \ /
      Last update: 2014-04-26 23:41    [W:3.019 / U:0.828 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site