lkml.org 
[lkml]   [2011]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] kconfig/nconf: prevent segfault on empty menu
    Date
    nconf does not check the validity of the current menu when help is requested
    (with either <F2>, '?' or 'h'). This leads to a NULL pointer dereference when an
    empty menu is encountered.

    The following reduced testcase exposes the problem:

    config DEP
    bool

    menu "FOO"

    config BAR
    bool "BAR"
    depends on DEP

    endmenu

    Issue will happen when entering menu "FOO" and requesting help.

    nconf is the only front-end which do not filter the validity of the current
    menu. Such filter can not really happen beforehand as other key which does not
    deals with the current menu might be entered by the user, so just bails out
    earlier if we encounter an invalid menu.

    Cc: Nir Tzachar <nir.tzachar@gmail.com>
    Cc: Andrej Gelenberg <andrej.gelenberg@udo.edu>
    Reported-by: Andrej Gelenberg <andrej.gelenberg@udo.edu>
    Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
    ---
    scripts/kconfig/nconf.c | 7 ++++++-
    1 files changed, 6 insertions(+), 1 deletions(-)

    diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
    index 24fc79a..eb9e49d 100644
    --- a/scripts/kconfig/nconf.c
    +++ b/scripts/kconfig/nconf.c
    @@ -1222,7 +1222,12 @@ static void conf_message_callback(const char *fmt, va_list ap)

    static void show_help(struct menu *menu)
    {
    - struct gstr help = str_new();
    + struct gstr help;
    +
    + if (!menu)
    + return;
    +
    + help = str_new();
    menu_get_ext_help(menu, &help);
    show_scroll_win(main_window, _(menu_get_prompt(menu)), str_get(&help));
    str_free(&help);
    --
    1.7.3.4.574.g608b.dirty


    \
     
     \ /
      Last update: 2011-07-10 09:29    [W:0.047 / U:0.064 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site