lkml.org 
[lkml]   [2018]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.17 268/336] serial: core: Make sure compiler barfs for 16-byte earlycon names
    Date
    4.17-stable review patch.  If anyone has any objections, please let me know.

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

    From: Douglas Anderson <dianders@chromium.org>

    [ Upstream commit c1c734cb1f54b062f7e67ffc9656d82f5b412b9c ]

    As part of bringup I ended up wanting to call an earlycon driver by a
    name that was exactly 16-bytes big, specifically "qcom_geni_serial".

    Unfortunately, when I tried this I found that things compiled just
    fine. They just didn't work.

    Specifically the compiler felt perfectly justified in initting the
    ".name" field of "struct earlycon_id" with the full 16-bytes and just
    skipping the '\0'. Needless to say, that behavior didn't seem ideal,
    but I guess someone must have allowed it for a reason.

    One way to fix this is to shorten the name field to 15 bytes and then
    add an extra byte after that nobody touches. This should always be
    initted to 0 and we're golden.

    There are, of course, other ways to fix this too. We could audit all
    the users of the "name" field and make them stop at both null
    termination or at 16 bytes. We could also just make the name field
    much bigger so that we're not likely to run into this. ...but both
    seem like we'll just hit the bug again.

    Signed-off-by: Douglas Anderson <dianders@chromium.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    include/linux/serial_core.h | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/include/linux/serial_core.h
    +++ b/include/linux/serial_core.h
    @@ -348,7 +348,8 @@ struct earlycon_device {
    };

    struct earlycon_id {
    - char name[16];
    + char name[15];
    + char name_term; /* In case compiler didn't '\0' term name */
    char compatible[128];
    int (*setup)(struct earlycon_device *, const char *options);
    };

    \
     
     \ /
      Last update: 2018-08-01 20:20    [W:5.676 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site