Message ID | 20231030104758.241472-1-rf@opensource.cirrus.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2114227vqb; Mon, 30 Oct 2023 03:48:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHIC2m9SVfEbERsgrkoNTy8JGIJR5pZlfTfaR8SfsmFNo5UUkbdcNuGPfeybA9yQxaoS9cM X-Received: by 2002:a17:902:d50b:b0:1cc:52ca:2e01 with SMTP id b11-20020a170902d50b00b001cc52ca2e01mr1211505plg.16.1698662903338; Mon, 30 Oct 2023 03:48:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698662903; cv=none; d=google.com; s=arc-20160816; b=uUJdCWBV2OJiSGzffDhlLigiTC+AWeAgcChRPFSH8agPmTcXeOt4WMfpTxuD6m8yX1 RACGwlpFUoNGabPgBNTO5/Iox0epYP/cUqxULFTsy6CilFEeOX/ewbw0SWoIZc6OeDHz iPX8mhQiThtNTS9m3zNVEZajee1VCTw6qMNIARy9290qJ5jEh9aOCj/LuHosNV3bWA3D 7Hcw67HKDrmhoGEQ+lPpNjLsVBpDJSFNEmfVJcCiJQ3e9ufNKqnYSNxIQDT4RFeSdMvg 1EYN2gISebKqQv3DvoNQfZm0UPbc56BrjhumjBJTDS3uHUBCXB4tS/CYqAUIs56+rcQT cSxw== 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=ptuXmZ2hqF+4cAMHCMtuZ+jtvOIi1tvA4FTQu+eJeZY=; fh=zFy42mhpE2u4xFwte26xQa/ZLoka/uZdP9ObmF0xxgQ=; b=Ui/eCSD26jiEyZeeMXKcwuCqUFlYV6fojvyFkb1tzyYNyAovmXe7S37LtqO82+7ms3 8IXyq4P4rulz8L4+Ar4d4b5dPOBu2F5zylkY8HdxRPdrV4Ggb8TcwL4vmZ8IYT+MJCZ1 mjm2a5qYVelRAR7PWa69ItZSbDV6daTtMgaKqOrvMEcDPV8UZo18eh1YJNpNuFNNZ1u2 gNKuWgleoW9zY1nUmEqQ3aBRKUj6Aq/Bu3aI8mcQjE7+9heWm39VCnwlYq4wYC5qAWyu uJx9fSzaKf4Lp4c+5KNh2muL6loyGIAaRcouMGWRTb7v9eCFCC0TUuBxOMwq/HwwGxrF ErJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="d03p7Fq/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id b15-20020a170903228f00b001cc51ee5fb1si950623plh.585.2023.10.30.03.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 03:48:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="d03p7Fq/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 7B2028031B32; Mon, 30 Oct 2023 03:48:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232654AbjJ3KsS (ORCPT <rfc822;zxc52fgh@gmail.com> + 31 others); Mon, 30 Oct 2023 06:48:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232783AbjJ3KsP (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 30 Oct 2023 06:48:15 -0400 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3164B3; Mon, 30 Oct 2023 03:48:05 -0700 (PDT) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 39U5NJmt019400; Mon, 30 Oct 2023 05:48:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PODMain02222019; bh=p tuXmZ2hqF+4cAMHCMtuZ+jtvOIi1tvA4FTQu+eJeZY=; b=d03p7Fq/26I1I7p8x +HzGi8+op9McZ9k3gqqazGHw7pTqGGiLgitxeqN0Q+GmJJJRCIv+wInIA37rV44e oFIGSAUu3UBzpQmfPUy9sxnFJL4ImLV6jcgxpckmkC2bl3oMBDrH9WTtUkMLKStU BgacqS+yyK4Bnv6Vh3Ewzik/KH1RAo0SmLGv9ogal92Myk2ZLB0YG/BZ6y509xdE ZQW0egYuKJI908uXoHi1qnf3Apl7z5oM4lcZW9CrzKw3kysoaFXknYkRF43Cy5v2 5v4WV3k1iLBFYWtPkwet+wqtccqPTAcXd8/H4NcXZDO0Q/iXIn8NdDkjkCXN9Vf4 oc9Kw== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3u0ypxay71-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 30 Oct 2023 05:48:00 -0500 (CDT) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Mon, 30 Oct 2023 10:47:58 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.39 via Frontend Transport; Mon, 30 Oct 2023 10:47:58 +0000 Received: from edi-sw-dsktp-006.ad.cirrus.com (edi-sw-dsktp-006.ad.cirrus.com [198.90.251.82]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 4580911AB; Mon, 30 Oct 2023 10:47:58 +0000 (UTC) From: Richard Fitzgerald <rf@opensource.cirrus.com> To: <brendan.higgins@linux.dev>, <davidgow@google.com>, <rmoar@google.com> CC: <linux-kselftest@vger.kernel.org>, <kunit-dev@googlegroups.com>, <linux-kernel@vger.kernel.org>, <patches@opensource.cirrus.com>, "Richard Fitzgerald" <rf@opensource.cirrus.com>, Dan Carpenter <dan.carpenter@linaro.org> Subject: [PATCH RESEND] kunit: debugfs: Fix unchecked dereference in debugfs_print_results() Date: Mon, 30 Oct 2023 10:47:58 +0000 Message-ID: <20231030104758.241472-1-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: e-QvDM-tsvIRroqT8mU1PgWB9N0O7hQW X-Proofpoint-ORIG-GUID: e-QvDM-tsvIRroqT8mU1PgWB9N0O7hQW X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS 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: <linux-kernel.vger.kernel.org> 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]); Mon, 30 Oct 2023 03:48:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781177152728392849 X-GMAIL-MSGID: 1781177152728392849 |
Series |
[RESEND] kunit: debugfs: Fix unchecked dereference in debugfs_print_results()
|
|
Commit Message
Richard Fitzgerald
Oct. 30, 2023, 10:47 a.m. UTC
Move the call to kunit_suite_has_succeeded() after the check that
the kunit_suite pointer is valid.
This was found by smatch:
lib/kunit/debugfs.c:66 debugfs_print_results() warn: variable
dereferenced before check 'suite' (see line 63)
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Fixes: 38289a26e1b8 ("kunit: fix debugfs code to use enum kunit_status, not bool")
---
lib/kunit/debugfs.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Comments
On Mon, Oct 30, 2023 at 6:48 AM Richard Fitzgerald <rf@opensource.cirrus.com> wrote: > > Move the call to kunit_suite_has_succeeded() after the check that > the kunit_suite pointer is valid. > > This was found by smatch: > > lib/kunit/debugfs.c:66 debugfs_print_results() warn: variable > dereferenced before check 'suite' (see line 63) > > Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> > Reported-by: Dan Carpenter <dan.carpenter@linaro.org> > Fixes: 38289a26e1b8 ("kunit: fix debugfs code to use enum kunit_status, not bool") Hello! This patch looks good to me! Thanks for fixing this! Reviewed-by: Rae Moar <rmoar@google.com> -Rae > --- > lib/kunit/debugfs.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/lib/kunit/debugfs.c b/lib/kunit/debugfs.c > index 9d167adfa746..382706dfb47d 100644 > --- a/lib/kunit/debugfs.c > +++ b/lib/kunit/debugfs.c > @@ -60,12 +60,14 @@ static void debugfs_print_result(struct seq_file *seq, struct string_stream *log > static int debugfs_print_results(struct seq_file *seq, void *v) > { > struct kunit_suite *suite = (struct kunit_suite *)seq->private; > - enum kunit_status success = kunit_suite_has_succeeded(suite); > + enum kunit_status success; > struct kunit_case *test_case; > > if (!suite) > return 0; > > + success = kunit_suite_has_succeeded(suite); > + > /* Print KTAP header so the debugfs log can be parsed as valid KTAP. */ > seq_puts(seq, "KTAP version 1\n"); > seq_puts(seq, "1..1\n"); > -- > 2.30.2 >
diff --git a/lib/kunit/debugfs.c b/lib/kunit/debugfs.c index 9d167adfa746..382706dfb47d 100644 --- a/lib/kunit/debugfs.c +++ b/lib/kunit/debugfs.c @@ -60,12 +60,14 @@ static void debugfs_print_result(struct seq_file *seq, struct string_stream *log static int debugfs_print_results(struct seq_file *seq, void *v) { struct kunit_suite *suite = (struct kunit_suite *)seq->private; - enum kunit_status success = kunit_suite_has_succeeded(suite); + enum kunit_status success; struct kunit_case *test_case; if (!suite) return 0; + success = kunit_suite_has_succeeded(suite); + /* Print KTAP header so the debugfs log can be parsed as valid KTAP. */ seq_puts(seq, "KTAP version 1\n"); seq_puts(seq, "1..1\n");