From patchwork Tue Jun 18 18:56:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: HONG Yifan X-Patchwork-Id: 13702854 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E46B15ECD5 for ; Tue, 18 Jun 2024 18:56:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718736975; cv=none; b=LtsepCQQaevM/Y7+UZfLA1lliPYBdAOMsxGGpBYLrl1pX3mdO9gtcE/KnsOgD5ykJasxHNZ8p1kBfV8xwDqEajt0POB8mhNj82MdiNtO5F8+YcSDZZQP3OqlB0SwiM4m/fE/3BiwUC0/uyAZSh4ZNs+kN8nKJZqc4ghAEwuzYdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718736975; c=relaxed/simple; bh=DifcGgZ4gqLiYudF45uENxryUqD1+XBdS+PO9ke3mRg=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=r70HNz42YOc7iSUJ4+jxRFVrnT4rk9ym5e5FsMbKryPgL4lElfR27O5DVeBfAAe8YkcVZM9A1k61C9Ek5IK+6UV9YiuYwBX4DTblZN7jSK9ipc0Fkz1LfCK87c8R4JSX35zsM19VN3kh5PJWNwEp5929qz+r5nvdft18tLCGe6E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--elsk.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=sILDxUkM; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--elsk.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sILDxUkM" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6313189f622so112979917b3.2 for ; Tue, 18 Jun 2024 11:56:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718736972; x=1719341772; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=GTbgu4ja5vqrEkefct+zJFTUB3eF6qISm880FN6/VHA=; b=sILDxUkMMh2kuT3VcMeyC3+0vy1KmZhVV77lTZjO4a5pLf/jAvsBl812ONUshKN1e/ OVu5O3N9HH1Hou8soKz6FPS9rQ8tu/pgn6vMWnLXwYlb71ZAKlCE6j8XcieIhj7WCTsw sJ05OCj/WWK4AmlxXSW+712ed53dhO4M6CWT/XD8GoUzrD4kqqhEVNXeviuhwzfnoGxW r30Fo/SkTNZYRr8SRclajL2Jp0BNsTMkInGIWMepqQJWIYkcTWKnWrPQnzeNJ6BFzf1i qACBVZB7UCD+Ehrh4UZp2tNwnyshQpaLFPTttyNuf9qEHXMtDDY1jmyhU4XGUfLmeoGW xcyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718736972; x=1719341772; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=GTbgu4ja5vqrEkefct+zJFTUB3eF6qISm880FN6/VHA=; b=KxoQfS0XfVeKrA/ORKnyczr+mYROJamNI4d8KwhPXX+2vDY2GsCPKh3XUunfbc3RKi OaCvKxcu/61RU7JOu6G9RgB5OQkc2y9ua+A8plUGp9p96zRqlaolq8WWCUcfT/hcwbig ynOFoBjTda0A0Kvx90XBJ9/Wg9OMOF2ow2bdIa6ew3yrxCDlYe9E/AGDmtGbKq5n9s/W i5S4ph9DDLt9yPDA5YgspjgmGQJ90ppfgQO9/e1Ct1jBPG46QGOABs/QhdXqmyr9PW6D 7xBd0mMfiZKky/8Oex5pC12ONPqHoSWdcI3Yy77qf3WyZsh1eyPyhYKYEvArkn5UyYb4 vmKw== X-Forwarded-Encrypted: i=1; AJvYcCVE9Og4OUpwhHNcOS3xE8yM3LNyBe3xqVOKGcvYIq1+cdCK9sNgYFO1Z0KOP6wUQO3zCFvzByZYi8t84NQEmthj1nwhKNLkW9+3BbdB X-Gm-Message-State: AOJu0YxzbZoEISU4o12Rmx4dYFXzVyUGr50plyRzdXtMNfRu1L7ixsf2 EphZLk+zXACcIDvgOvsSijw6qqxhQkYCvJ8huGVLdaa25qe7IkNVuKhP248KCPk7pJ9oag== X-Google-Smtp-Source: AGHT+IFZeEsxJqQbDjMsCd8Wkmied2xaJ0XNpiPIC05JKI7BgGaBpQVrxgjyuAWOdir7s1t/4HRURCmK X-Received: from elsk.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:dbd]) (user=elsk job=sendgmr) by 2002:a05:690c:7091:b0:62c:f01d:3470 with SMTP id 00721157ae682-63a8fbea0d1mr1446157b3.6.1718736972216; Tue, 18 Jun 2024 11:56:12 -0700 (PDT) Date: Tue, 18 Jun 2024 18:56:09 +0000 Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.45.2.627.g7a2c4fd464-goog Message-ID: <20240618185609.4096399-1-elsk@google.com> Subject: [PATCH] kconfig: Prevent segfault when getting filename From: Yifan Hong To: Masahiro Yamada Cc: Yifan Hong , kernel-team@android.com, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org ... and lineno in recursive checks. If the following snippet is found in Kconfig: config FOO tristate depends on BAR select BAR help foo ... without BAR defined; then if one runs `make tinyconfig`, there is a segfault. Kconfig:34:error: recursive dependency detected! Kconfig:34: symbol FOO depends on BAR make[4]: *** [scripts/kconfig/Makefile:85: allnoconfig] Segmentation fault This is because of the following. BAR is a fake entry created by sym_lookup() with prop being NULL. In the recursive check, there is a NULL check for prop to fall back to stack->sym->prop if stack->prop is NULL. However, in this case, stack->sym points to the fake BAR entry created by sym_lookup(), so prop is still NULL. prop was then referenced without additional NULL checks, causing segfault. Similarly, menu is also accessed without NULL checks. However, sym_lookup() creates entry that is not a choice, so technically it shouldn't fall into the state where menu is NULL for choices. But I mechnically apply the NULL check anyways for completeness. This mechnical patch avoids the segfault. The above snippet produces the following error with this patch: Kconfig:34:error: recursive dependency detected! Kconfig:34: symbol FOO depends on BAR ???:-1: symbol BAR is selected by FOO That being said, I am not sure if it is the right fix conceptually and in functionality. Signed-off-by: Yifan Hong --- scripts/kconfig/symbol.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 8df0a75f40b9..72ab4f274289 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -1045,6 +1045,8 @@ static void sym_check_print_recursive(struct symbol *last_sym) struct menu *menu = NULL; struct property *prop; struct dep_stack cv_stack; + const char *filename = NULL; + int lineno = 0; if (sym_is_choice_value(last_sym)) { dep_stack_insert(&cv_stack, last_sym); @@ -1060,6 +1062,10 @@ static void sym_check_print_recursive(struct symbol *last_sym) } for (; stack; stack = stack->next) { + filename = "???"; + lineno = 0; + menu = NULL; + sym = stack->sym; next_sym = stack->next ? stack->next->sym : last_sym; prop = stack->prop; @@ -1073,45 +1079,52 @@ static void sym_check_print_recursive(struct symbol *last_sym) if (prop->menu) break; } + if (menu) { + filename = menu->filename; + lineno = menu->lineno; + } + } else if (prop) { + filename = prop->filename; + lineno = prop->lineno; } if (stack->sym == last_sym) fprintf(stderr, "%s:%d:error: recursive dependency detected!\n", - prop->filename, prop->lineno); + filename, lineno); if (sym_is_choice(sym)) { fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n", - menu->filename, menu->lineno, + filename, lineno, sym->name ? sym->name : "", next_sym->name ? next_sym->name : ""); } else if (sym_is_choice_value(sym)) { fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n", - menu->filename, menu->lineno, + filename, lineno, sym->name ? sym->name : "", next_sym->name ? next_sym->name : ""); } else if (stack->expr == &sym->dir_dep.expr) { fprintf(stderr, "%s:%d:\tsymbol %s depends on %s\n", - prop->filename, prop->lineno, + filename, lineno, sym->name ? sym->name : "", next_sym->name ? next_sym->name : ""); } else if (stack->expr == &sym->rev_dep.expr) { fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n", - prop->filename, prop->lineno, + filename, lineno, sym->name ? sym->name : "", next_sym->name ? next_sym->name : ""); } else if (stack->expr == &sym->implied.expr) { fprintf(stderr, "%s:%d:\tsymbol %s is implied by %s\n", - prop->filename, prop->lineno, + filename, lineno, sym->name ? sym->name : "", next_sym->name ? next_sym->name : ""); } else if (stack->expr) { fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n", - prop->filename, prop->lineno, + filename, lineno, sym->name ? sym->name : "", prop_get_type_name(prop->type), next_sym->name ? next_sym->name : ""); } else { fprintf(stderr, "%s:%d:\tsymbol %s %s is visible depending on %s\n", - prop->filename, prop->lineno, + filename, lineno, sym->name ? sym->name : "", prop_get_type_name(prop->type), next_sym->name ? next_sym->name : "");