lkml.org 
[lkml]   [2015]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 091/165] console: Fix console name size mismatch
    Date
    3.16.7-ckt9 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Peter Hurley <peter@hurleysoftware.com>

    commit 30a22c215a0007603ffc08021f2e8b64018517dd upstream.

    commit 6ae9200f2cab7 ("enlarge console.name") increased the storage
    for the console name to 16 bytes, but not the corresponding
    struct console_cmdline::name storage. Console names longer than
    8 bytes cause read beyond end-of-string and failure to match
    console; I'm not sure if there are other unexpected consequences.

    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    kernel/printk/console_cmdline.h | 2 +-
    kernel/printk/printk.c | 1 +
    2 files changed, 2 insertions(+), 1 deletion(-)

    diff --git a/kernel/printk/console_cmdline.h b/kernel/printk/console_cmdline.h
    index cbd69d842341..2ca4a8b5fe57 100644
    --- a/kernel/printk/console_cmdline.h
    +++ b/kernel/printk/console_cmdline.h
    @@ -3,7 +3,7 @@

    struct console_cmdline
    {
    - char name[8]; /* Name of the driver */
    + char name[16]; /* Name of the driver */
    int index; /* Minor dev. to use */
    char *options; /* Options for the driver */
    #ifdef CONFIG_A11Y_BRAILLE_CONSOLE
    diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
    index 971285d5b7a0..cce20d2f38d5 100644
    --- a/kernel/printk/printk.c
    +++ b/kernel/printk/printk.c
    @@ -2388,6 +2388,7 @@ void register_console(struct console *newcon)
    for (i = 0, c = console_cmdline;
    i < MAX_CMDLINECONSOLES && c->name[0];
    i++, c++) {
    + BUILD_BUG_ON(sizeof(c->name) != sizeof(newcon->name));
    if (strcmp(c->name, newcon->name) != 0)
    continue;
    if (newcon->index >= 0 &&

    \
     
     \ /
      Last update: 2015-03-25 15:41    [W:4.260 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site