From patchwork Sun Jul 10 07:27:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 960732 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6A7S3xE027625 for ; Sun, 10 Jul 2011 07:28:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755425Ab1GJH13 (ORCPT ); Sun, 10 Jul 2011 03:27:29 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:52387 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755368Ab1GJH1W (ORCPT ); Sun, 10 Jul 2011 03:27:22 -0400 Received: by mail-iw0-f174.google.com with SMTP id 6so2828374iwn.19 for ; Sun, 10 Jul 2011 00:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=IVeT28yQAwAHKQO04O/cdKMAvKKnQvnSCqaNOebzeiM=; b=DUuSTwzvgVj1SDv3lqrPLyaS6RsDJXjehbQoUSraxwngwodgHUaYS+kMML0GCMGlF9 cTxdeattOhcWVn+BrUmc1lxRHOAUiTH1vMDON+auFVw6c3nTf7X5BMHDIHWJKhblRAgc Amd4HRs15WrYN9RQmyPFRWf1lLkKetPdl4E4U= Received: by 10.42.246.65 with SMTP id lx1mr3080115icb.254.1310282841770; Sun, 10 Jul 2011 00:27:21 -0700 (PDT) Received: from localhost.localdomain ([184.175.3.95]) by mx.google.com with ESMTPS id s2sm12594594icw.17.2011.07.10.00.27.20 (version=SSLv3 cipher=OTHER); Sun, 10 Jul 2011 00:27:21 -0700 (PDT) From: Arnaud Lacombe To: linux-kbuild@vger.kernel.org, Michal Marek Cc: linux-kernel@vger.kernel.org, Arnaud Lacombe , Nir Tzachar , Andrej Gelenberg Subject: [PATCH 2/2] kconfig/nconf: prevent segfault on empty menu Date: Sun, 10 Jul 2011 03:27:05 -0400 Message-Id: <1310282825-14509-2-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.3.4.574.g608b.dirty In-Reply-To: <1310282825-14509-1-git-send-email-lacombar@gmail.com> References: <1310282825-14509-1-git-send-email-lacombar@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 10 Jul 2011 07:28:03 +0000 (UTC) nconf does not check the validity of the current menu when help is requested (with either , '?' 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 Cc: Andrej Gelenberg Reported-by: Andrej Gelenberg Signed-off-by: Arnaud Lacombe --- 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);