Skip to content

Commit

Permalink
kconfig/nconf: prevent segfault on empty menu
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Michal Marek <mmarek@suse.cz>
  • Loading branch information
Arnaud Lacombe authored and Michal Marek committed Jul 13, 2011
1 parent 5416857 commit f98ee76
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion scripts/kconfig/nconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,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);
Expand Down

0 comments on commit f98ee76

Please sign in to comment.