From patchwork Sat Nov 18 07:59:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 166462 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1047781vqn; Fri, 17 Nov 2023 23:59:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+Qm4cLcDQQBrffRkb02SBcmAYpjisKPlFuadfCaSnMQJeEl2KLRdro/MhXmLyw14eMns+ X-Received: by 2002:a05:6a00:2444:b0:68f:bb02:fdf with SMTP id d4-20020a056a00244400b0068fbb020fdfmr2045770pfj.27.1700294367238; Fri, 17 Nov 2023 23:59:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700294367; cv=none; d=google.com; s=arc-20160816; b=rFUzJaYuDxEiIWPK3hrBOjoqd4TeWMyzFUq8NjG2r9tjVvwsumnzLnCqopuWcubpKd +I92GvXsh/QcKeNk69gsTjcj69GIaY616gtJVzy5yTQzyyOuRCFmGdy/vQtzmIBPKqlx yyElZwSakZHbOsuu92HcLrddGwoXwEkD4Bz4NDjS3v4d5V2LI+06lZGzmgyStDlP28z4 KG9Tj7kfGfO6SX4XoMW/v8Cyrr1vAbfAx2Np1mmV/xwEpSphmCY5rVf4cSmAR4893pQt 34ZwzsX+XkEh4iHVAScHXYpXQ60hHyYTlpqTSKwb2QxDzqfMlDp3QFzLAF0hmLcT2ZaO CZ6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=lo2a9lzuNhFXPxNfgxZ+IIx+QQJMvdklhtsiKq0yc9w=; fh=oQbvuNnOUeIuBT5siQdg+euUHNNdn+CeEwAg69/1RSo=; b=MfIwtqwYb2KJ02JRGxlcwz4/IeMGoN/pfZ9AK14U0vGdEBwocesEQ2VqFFf3UrcoqS otgRSkGm7qTOvePc/YlRHeRsEDZ595iH/NHmXA0nMoSkMisTmXoO0n/0zTbT5RUm0qHM 81ArdhP7aj1xk1ZgrZzat0u+xFqH+1UcC/3GsbWItip90TLEyKTpdyw2RnRN7KgOQYrd D46v+7hLTgmw5toS2peJ/kngLjoUU+fCmuJh3WPHRa/9eJlzqGNJEmJCIeO2bWWfmi6R O6zom7zQFhAkvIMaKCvdAgvY+61uFIvLTUVyfH9VrpH6wuwRsSERJmWgM/062IxCcJs3 TW2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SqkBXj4R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id 65-20020a630044000000b005c21d7ee51asi1555480pga.301.2023.11.17.23.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 23:59:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SqkBXj4R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 0B2CA8280D69; Fri, 17 Nov 2023 23:59:26 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232139AbjKRH7V (ORCPT + 29 others); Sat, 18 Nov 2023 02:59:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230064AbjKRH7U (ORCPT ); Sat, 18 Nov 2023 02:59:20 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36D02D57 for ; Fri, 17 Nov 2023 23:59:17 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17AD1C433C7; Sat, 18 Nov 2023 07:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700294356; bh=FUJGT7Wxv+A9qlisbFn6Z/VU7oX5Ys4xFHdHW9fEVFQ=; h=From:To:Cc:Subject:Date:From; b=SqkBXj4ROG6o8h/47chPS34ducc2BQrT+TZDy8Ool3IvQ0UiqmYgaVQm838jnb9h/ dh2Eod92LXLdxcInnHoEBD6/o0f7gRxdA0me2vM/GcgoEkfYg5dVH5+O6SQoRYGCG5 OE7qeFXedj3McK0OrSTq9mPaVbsQu4dPSscNaDuFZ5ztZ7zDXynQ0Dqxba7zGfHmor 0jhLRNRP6HcpIdgjxxn4XSAourXfi3o1KRvDq3Tzi28o8o3wW1d1sa8Ca0pB4Ptd+D nGiYYCsO15qTJzRHCoNpxDdraZWrTqt3cC0s8BuZxaTn8aGGdel0soxC3u//6YlTYs QhV+yQDtLVH6Q== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH 1/6] kconfig: require a space after '#' for valid input Date: Sat, 18 Nov 2023 16:59:07 +0900 Message-Id: <20231118075912.1303509-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 23:59:26 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782887866093036649 X-GMAIL-MSGID: 1782887866093036649 Currently, when an input line starts with '#', (line + 2) is passed to memcmp() without checking line[1]. It means that line[1] can be any arbitrary character. For example, "#KCONFIG_FOO is not set" is accepted as valid input, functioning the same as "# CONFIG_FOO is not set". More importantly, this can potentially lead to a buffer overrun if line[1] == '\0'. It occurs if the input only contains '#', as (line + 2) points to an uninitialized buffer. Check line[1], and skip the line if it is not a space. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 2ba4dfdd1aee..556b7f087dbb 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -426,6 +426,8 @@ int conf_read_simple(const char *name, int def) conf_lineno++; sym = NULL; if (line[0] == '#') { + if (line[1] != ' ') + continue; if (memcmp(line + 2, CONFIG_, strlen(CONFIG_))) continue; p = strchr(line + 2 + strlen(CONFIG_), ' ');