lkml.org 
[lkml]   [2017]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/12] efi/libstub: Fix harmless command line parsing bug
    Date
    When we parse the 'efi=' command line parameter in the stub, we
    fail to take spaces into account. Currently, the only way this
    could result in unexpected behavior is when the string 'nochunk'
    appears as a separate command line argument after 'efi=xxx,yyy,zzz ',
    so this is harmless in practice. But let's fix it nonetheless.

    Cc: Matt Fleming <matt@codeblueprint.co.uk>
    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    ---
    drivers/firmware/efi/libstub/efi-stub-helper.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c
    index 919822b7773d..3290fae0b38f 100644
    --- a/drivers/firmware/efi/libstub/efi-stub-helper.c
    +++ b/drivers/firmware/efi/libstub/efi-stub-helper.c
    @@ -436,14 +436,14 @@ efi_status_t efi_parse_options(char *cmdline)
    * Remember, because efi= is also used by the kernel we need to
    * skip over arguments we don't understand.
    */
    - while (*str) {
    + while (*str && *str != ' ') {
    if (!strncmp(str, "nochunk", 7)) {
    str += strlen("nochunk");
    __chunk_size = -1UL;
    }

    /* Group words together, delimited by "," */
    - while (*str && *str != ',')
    + while (*str && *str != ' ' && *str != ',')
    str++;

    if (*str == ',')
    --
    2.9.3
    \
     
     \ /
      Last update: 2017-04-04 18:05    [W:4.180 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site