Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2937188iob; Sun, 1 May 2022 01:56:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2BFDjHQGyiG8dx928OEDq7fF9kDJtTWTjpCsDiDVqC2LfsF5k5CKxGDNdmGzzwj3+mh4D X-Received: by 2002:a19:790c:0:b0:471:fd10:2980 with SMTP id u12-20020a19790c000000b00471fd102980mr5510775lfc.457.1651395378670; Sun, 01 May 2022 01:56:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651395378; cv=none; d=google.com; s=arc-20160816; b=Adb9T0fun3ZriCaochOeRLhtfG1/e9Osc9ii6lJMJ7IFrefxJnNckkImcLbQ7uVD/8 PslEaBQDfPIeStgZonLFLEC0cVixnphQeOFg9FV0aDB3wkdTXsV2LPuHQKlOrl6VJfd6 w6evH5iFHwfFsZG97NDRBQS4BhlgV3AWo62MV7lg4p2pGpL5+7NbxTN/xONJCc8oEAdD qgenbVI1HW6CQ9/j6aAtbzuoMWo6eHGOGXCwnurX4lzI1O67+Rzt8FySQX/j+M4Csxif Bp8lHeYjT7eVc5BgvBp39qeFpr+wsVWUd5xHEfSkNlu2vqT8uRwMOs1YmPtfexPakRWm bXew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=Y0mJtz6kGToZ1XuYtks7aF8CEo8QOuFB6egMwMGeOWg=; b=cREuGRHQeBaBa7ugBnN3qvQR7IY2ocY5RLl1/pQfmZu3X2FDqgRuiS+LCXPbixjBkK U91ANr5skvcyuJZBDmuvN3M7zebHtQfH4Nog557JTqGZpwkm3kWCLNcJhDheSp4XIj87 q9XUTEZ85PVgmhB2o3y6TpSGihfJqzXHZgipcrA+y4IQ8EQg3VMF2AqwY/7nrt3I5T6m PGQx+JW9YUCOZkawxGx42aRWp3eOMKYWOgGdo1n81W8E+lLHTXSAgdRFIh2QP+pvn5Zk +0DqFHnzmHW3r2sVF+4zdTj4t+XILGLAKMS2kVmKdQPTxZWv0U2y7m4AZAcmhhpMqMHg uvUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=nbl8KYpu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t13-20020a056512030d00b004719dabf3e1si10850051lfp.218.2022.05.01.01.55.49; Sun, 01 May 2022 01:56:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=nbl8KYpu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344530AbiD3DEF (ORCPT + 99 others); Fri, 29 Apr 2022 23:04:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242149AbiD3DDt (ORCPT ); Fri, 29 Apr 2022 23:03:49 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 088EFAE6B for ; Fri, 29 Apr 2022 20:00:25 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id l5-20020a170902ec0500b0015cf1cfa4eeso5004826pld.17 for ; Fri, 29 Apr 2022 20:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Y0mJtz6kGToZ1XuYtks7aF8CEo8QOuFB6egMwMGeOWg=; b=nbl8KYpua6DCCViS49Tu7tFMSfJFNtItyA9PjOYQUt/zaQpxJ+Qk+MzKnJ2Uws5813 xILu9buerl4skg+dLPG/xwJtdhMH3qEk5SBHQt7izarOoqvXn5fBrbXlNdo9FWjmOCtt k46+OAwUgCUm2leSRfcbs5hVejtSDmlCDWUzfHxc8J8u5APkCXBPw9AYO+c0gI1hDA0a t4l0pVkk10pT2rq+2WfVNPeHTchGYQ5ggguwhCUF7XocASQx2Sud+OyHJNMIPlu+8BSU 0foH7DU3KVCt+LPQ7JLp3CyA7ngS1P4UENLCGzqoVwxsuv3R4da85sDJd2h6T4dEDxWl wjBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Y0mJtz6kGToZ1XuYtks7aF8CEo8QOuFB6egMwMGeOWg=; b=MXjLxOSlZzeTDBl6Davxem9d92MJonnZovmslPQIdnCk8u/zrY9tVFePeJOgalhGtI nRcw4HjKLycufD8T3PKDWUkjZpHjaMVpLhEtc9gx1sw1BcatVE7MsnIEgdjQfSycmfx7 wQrvIEcxoWL5etumDETbxJUNMNRp2Z6Rpv4QGUlJEZ1tDkiVdfBmUbrqZEpf2miLDulE 26e9HCv8xkfPrEF7jx4cua4ai15e/27JB4Ucs+GLipeUzefp4MoJxrYORMwq4o2QH7Cj kGPimXDGkUm3cbUPzbHCpu+sJI3S9zTFyGXSSVdEmQlZiu3vaPO984LMF/wTnsDj239s bFnw== X-Gm-Message-State: AOAM531NLWSrFm+/sqb3Z2lOrREk3XrQm4xhzQyrjcA9az2xy5CxL+sL C2aR4fMWmpFfX9TOjraatOuY2Sh2B6+11A== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a17:90a:c986:b0:1d9:56e7:4e83 with SMTP id w6-20020a17090ac98600b001d956e74e83mr497866pjt.1.1651287624304; Fri, 29 Apr 2022 20:00:24 -0700 (PDT) Date: Sat, 30 Apr 2022 11:00:19 +0800 In-Reply-To: <20220429043913.626647-1-davidgow@google.com> Message-Id: <20220430030019.803481-1-davidgow@google.com> Mime-Version: 1.0 References: <20220429043913.626647-1-davidgow@google.com> X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [PATCH v2] kunit: Taint kernel if any tests run From: David Gow To: Brendan Higgins , Andy Shevchenko , Jonathan Corbet , Andrew Morton , Kees Cook , Shuah Khan , Greg KH Cc: David Gow , "Guilherme G . Piccoli" , Luis Chamberlain , Sebastian Reichel , John Ogness , Joe Fradley , Daniel Latypov , kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Jani Nikula Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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 KUnit tests are not supposed to run on production systems: they may do deliberately illegal things to trigger errors, and have security implications (assertions will often deliberately leak kernel addresses). Add a new taint type, TAINT_KUNIT to signal that a KUnit test has been run. This will be printed as 'N' (for kuNit, as K, U and T were already taken). This should discourage people from running KUnit tests on production systems, and to make it easier to tell if tests have been run accidentally (by loading the wrong configuration, etc.) Signed-off-by: David Gow --- Changes since v1: https://lore.kernel.org/linux-kselftest/20220429043913.626647-1-davidgow@google.com/ - Make the taint per-module, to handle the case when tests are in (longer lasting) modules. (Thanks Greg KH). Note that this still has checkpatch.pl warnings around bracket placement, which are intentional as part of matching the surrounding code. --- Documentation/admin-guide/tainted-kernels.rst | 1 + include/linux/panic.h | 3 ++- kernel/panic.c | 1 + lib/kunit/test.c | 4 ++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/tainted-kernels.rst b/Documentation/admin-guide/tainted-kernels.rst index ceeed7b0798d..8f18fc4659d4 100644 --- a/Documentation/admin-guide/tainted-kernels.rst +++ b/Documentation/admin-guide/tainted-kernels.rst @@ -100,6 +100,7 @@ Bit Log Number Reason that got the kernel tainted 15 _/K 32768 kernel has been live patched 16 _/X 65536 auxiliary taint, defined for and used by distros 17 _/T 131072 kernel was built with the struct randomization plugin + 18 _/N 262144 a KUnit test has been run === === ====== ======================================================== Note: The character ``_`` is representing a blank in this table to make reading diff --git a/include/linux/panic.h b/include/linux/panic.h index f5844908a089..1d316c26bf27 100644 --- a/include/linux/panic.h +++ b/include/linux/panic.h @@ -74,7 +74,8 @@ static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout) #define TAINT_LIVEPATCH 15 #define TAINT_AUX 16 #define TAINT_RANDSTRUCT 17 -#define TAINT_FLAGS_COUNT 18 +#define TAINT_KUNIT 18 +#define TAINT_FLAGS_COUNT 19 #define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1) struct taint_flag { diff --git a/kernel/panic.c b/kernel/panic.c index eb4dfb932c85..9a026d98a00c 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -404,6 +404,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { [ TAINT_LIVEPATCH ] = { 'K', ' ', true }, [ TAINT_AUX ] = { 'X', ' ', true }, [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, + [ TAINT_KUNIT ] = { 'N', ' ', true }, }; /** diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 0f66c13d126e..ea8e9162445d 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -498,6 +499,9 @@ int kunit_run_tests(struct kunit_suite *suite) struct kunit_result_stats suite_stats = { 0 }; struct kunit_result_stats total_stats = { 0 }; + /* Taint the kernel so we know we've run tests. */ + add_taint(TAINT_KUNIT, LOCKDEP_STILL_OK); + kunit_print_subtest_start(suite); kunit_suite_for_each_test_case(suite, test_case) { -- 2.36.0.464.gb9c8b46e94-goog