3 files changed, 25 insertions, 10 deletions

diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index 48d382e7e374..38cd69c5660e 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -303,10 +303,11 @@ do_resize:
                                 }
                 }
 
-                if (i < max_choice ||
-                    key == KEY_UP || key == KEY_DOWN ||
-                    key == '-' || key == '+' ||
-                    key == KEY_PPAGE || key == KEY_NPAGE) {
+                if (item_count() != 0 &&
+                    (i < max_choice ||
+                     key == KEY_UP || key == KEY_DOWN ||
+                     key == '-' || key == '+' ||
+                     key == KEY_PPAGE || key == KEY_NPAGE)) {
                         /* Remove highligt of current item */
                         print_item(scroll + choice, choice, FALSE);
 
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 387dc8daf7b2..a69cbd78fb38 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -670,11 +670,12 @@ static void conf(struct menu *menu, struct menu *active_menu)
                                   active_menu, &s_scroll);
                 if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
                         break;
-                if (!item_activate_selected())
-                        continue;
-                if (!item_tag())
-                        continue;
-
+                if (item_count() != 0) {
+                        if (!item_activate_selected())
+                                continue;
+                        if (!item_tag())
+                                continue;
+                }
                 submenu = item_data();
                 active_menu = item_data();
                 if (submenu)
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index b5c7d90df9df..fd3f0180e08f 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -146,11 +146,24 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
                         struct menu *menu = current_entry;
 
                         while ((menu = menu->parent) != NULL) {
+                                struct expr *dup_expr;
+
                                 if (!menu->visibility)
                                         continue;
+                                /*
+                                 * Do not add a reference to the
+                                 * menu's visibility expression but
+                                 * use a copy of it.  Otherwise the
+                                 * expression reduction functions
+                                 * will modify expressions that have
+                                 * multiple references which can
+                                 * cause unwanted side effects.
+                                 */
+                                dup_expr = expr_copy(menu->visibility);
+
                                 prop->visible.expr
                                         = expr_alloc_and(prop->visible.expr,
-                                                         menu->visibility);
+                                                         dup_expr);
                         }
                 }