• Arvind Sankar's avatar
    init/main.c: fix quoted value handling in unknown_bootoption · 283900e8
    Arvind Sankar authored
    Patch series "init/main.c: minor cleanup/bugfix of envvar handling", v2.
    
    unknown_bootoption passes unrecognized command line arguments to init as
    either environment variables or arguments.  Some of the logic in the
    function is broken for quoted command line arguments.
    
    When an argument of the form param="value" is processed by parse_args
    and passed to unknown_bootoption, the command line has
    
      param\0"value\0
    
    with val pointing to the beginning of value.  The helper function
    repair_env_string is then used to restore the '=' character that was
    removed by parse_args, and strip the quotes off fully.  This results in
    
      param=value\0\0
    
    and val ends up pointing to the 'a' instead of the 'v' in value.  This
    bug was introduced when repair_env_string was refactored into a separate
    function, and the decrement of val in repair_env_string became dead
    code.
    
    This causes two problems in unknown_bootoption in the two places where
    the val pointer is used as a substitute for the length of param:
    
    1. An argument of the form param=".value" is misinterpreted as a
       potential module parameter, with the result that it will not be
       placed in init's environment.
    
    2. An argument of the form param="value" is checked to see if param is
       an existing environment variable that should be overwritten, but the
       comparison is off-by-one and compares 'param=v' instead of 'param='
       against the existing environment. So passing, for example,
       TERM="vt100" on the command line results in init being passed both
       TERM=linux and TERM=vt100 in its environment.
    
    Patch 1 adds logging for the arguments and environment passed to init
    and is independent of the rest: it can be dropped if this is
    unnecessarily verbose.
    
    Patch 2 removes repair_env_string from initcall parameter parsing in
    do_initcall_level, as that uses a separate copy of the command line now
    and the repairing is no longer necessary.
    
    Patch 3 fixes the bug in unknown_bootoption by recording the length of
    param explicitly instead of implying it from val-param.
    
    This patch (of 3):
    
    Commit a99cd112 ("init: fix bug where environment vars can't be
    passed via boot args") introduced two minor bugs in unknown_bootoption
    by factoring out the quoted value handling into a separate function.
    
    When value is quoted, repair_env_string will move the value up 1 byte to
    strip the quotes, so val in unknown_bootoption no longer points to the
    actual location of the value.
    
    The result is that an argument of the form param=".value" is mistakenly
    treated as a potential module parameter and is not placed in init's
    environment, and an argument of the form param="value" can result in a
    duplicate environment variable: eg TERM="vt100" on the command line will
    result in both TERM=linux and TERM=vt100 being placed into init's
    environment.
    
    Fix this by recording the length of the param before calling
    repair_env_string instead of relying on val.
    
    Link: http://lkml.kernel.org/r/20191212180023.24339-4-nivedita@alum.mit.eduSigned-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
    Cc: Chris Metcalf <cmetcalf@tilera.com>
    Cc: Krzysztof Mazur <krzysiek@podlesie.net>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    283900e8
main.c 30.4 KB