kconfig: delay symbol direct dependency initialization
PATCH 1/1 kconfig: delay symbol direct dependency initialization
This fixes the use-after-free and associated crash in kconfig introduced in commit 246cf9c26bf11f2bffbecea6e5bd222eee7b1df8.
Signed-off-by Arnaud Lacombe <[email protected]>
Acked-by Catalin Marinas <[email protected]>
--- scripts/kconfig/expr.h | 1 - scripts/kconfig/menu.c | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-)
scripts/kconfig/expr.h +0 -1
@@ -165,7 +165,6 @@ struct menu {struct symbol *sym;struct property *prompt;struct expr *dep; -struct expr *dir_dep;unsigned int flags;char *help;struct file *file;
scripts/kconfig/menu.c +2 -5
@@ -107,7 +107,6 @@ static struct expr *menu_check_dep(struct expr *e)void menu_add_dep (struct expr *dep) { current_entry->dep =expr_alloc_and (current_entry->dep,menu_check_dep (dep)); - current_entry->dir_dep = current_entry->dep; }void menu_set_type (int type)
@@ -291,10 +290,6 @@ void menu_finalize(struct menu *parent)for (menu = parent->list; menu; menu = menu->next)menu_finalize (menu); }else if (sym) { -/* ignore inherited dependencies for dir_dep */ - sym->dir_dep.expr =expr_transform (expr_copy (parent->dir_dep)); - sym->dir_dep.expr =expr_eliminate_dups (sym->dir_dep.expr); - basedep = parent->prompt ? parent->prompt->visible.expr :NULL ; basedep =expr_trans_compare (basedep,E_UNEQUAL , &symbol_no); basedep =expr_eliminate_dups (expr_transform (basedep));
@@ -325,6 +320,8 @@ void menu_finalize(struct menu *parent) parent->next = last_menu->next; last_menu->next =NULL ; } + + sym->dir_dep.expr = parent->dep; }for (menu = parent->list; menu; menu = menu->next) { if (sym && sym_is_choice(sym) &&
Signature · 1 line
1.7.2.30.gc37d7.dirty
Quoted 5 lines · Arnaud Lacombe
This fixes the use-after-free and associated crash in kconfig introduced in commit
246cf9c26bf11f2bffbecea6e5bd222eee7b1df8.Signed-off-by Arnaud Lacombe <[email protected]>Acked-by Catalin Marinas <[email protected]>
Thanks for this.
Michal, could we please push this to mainline before 2.6.36 is released? It fixes a serious bug IMHO. Thanks.
Signature · 1 line
Catalin