From patchwork Wed Mar 8 17:02:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladis Dronov X-Patchwork-Id: 66377 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp458841wrd; Wed, 8 Mar 2023 09:14:49 -0800 (PST) X-Google-Smtp-Source: AK7set/LaebNB1HOskbf+bViu/K4wqrN4kMluupgH1ssCXX8d0aRjFTFOZFpC4yQlSRm2KAaHd9k X-Received: by 2002:a05:6a20:898f:b0:c7:49c4:c28c with SMTP id h15-20020a056a20898f00b000c749c4c28cmr19570353pzg.20.1678295689444; Wed, 08 Mar 2023 09:14:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678295689; cv=none; d=google.com; s=arc-20160816; b=Om6sD+/HMoeezEMPlG/dvyPyrRu+Beetbcqv+m54HwO1c0gNkKps0bqbZP3dZBoK0C A/iH9fzL72ZvsXm457igA5wtNF8ZXbNBBRiiwVmlWW/iEbrSrkwIuXRBBDsXbtJ/Q3Mi AIgWxJSF7xJ0lzJr25O+HYFxnkpX+7b7HNB1WWIQoj/6RLrNeUy9Lm5mvA3nOueFlEbx 26YOmo6yezaMK+V01Y76MSxDu/PrUx9rT7G9JapFaLw1PxD/EVSxsY0Z0cv3FMtN9jB8 T8S+61THdLPI881Rv3WYwLaDP8NO1TxdPrHqbvFB56mL69c9HZJdCeM9W6OW1DezpyC1 C4QQ== 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=+bV6MJeZtqLU80fZFFPU6YZTkzQK1mAwlHMg0ipvOFY=; b=vHvEWglKTEo7zGeHCzjqaNOkHPwN5MroHHw06bxpvJLBJnWtgSJeR0GT/ABCiPfHcD Rtr/p6XcltSktMdCRk2w8HDFLV7M4aLaT/8+/cg8w8xDMNp3tp+1eGwkg2YNXgOatcEv BbS70t08/gqPpud7VsXWUTHiTvB4cOP/apv4jjS8LD3s3SvDQd+qmCz3YJAppTHTg2a4 gdFpO/yvbjWyJpznIjk+lAzKu41JFpwlqaqKVQJ6RSwIieNpaiL/a5aKlnkYky55br0Y +E1onArQisMFpN/g20YCO7XMzjE4ByuLsdcnlxoYK1TQCqx+UrBpJItzR3W4BPZIlLcJ TCVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=An2dSBCY; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h191-20020a6383c8000000b004fb416b8f0dsi15177075pge.39.2023.03.08.09.14.31; Wed, 08 Mar 2023 09:14:49 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=An2dSBCY; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229636AbjCHRFI (ORCPT + 99 others); Wed, 8 Mar 2023 12:05:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230232AbjCHREx (ORCPT ); Wed, 8 Mar 2023 12:04:53 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1228E61A93 for ; Wed, 8 Mar 2023 09:03:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678295014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+bV6MJeZtqLU80fZFFPU6YZTkzQK1mAwlHMg0ipvOFY=; b=An2dSBCYT9iEsUPJAw8EnvU9n9mmgupFB6q2m/w9Ss91P6POLkP2rYZCFEg/fIOynSQfJz VDi95Uqhn7T2B9/AeRJaF6GHGL5AdPv6qWIxI30//D8TdJLd6Ak2vfin2VcgCj5k7FGWf9 TE9mBWyfzjZXjXcCCt692xAqVu2RTjc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-352-7xreSsEqMGCNlXMwQinL-g-1; Wed, 08 Mar 2023 12:03:31 -0500 X-MC-Unique: 7xreSsEqMGCNlXMwQinL-g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6294E85CCE7; Wed, 8 Mar 2023 17:03:30 +0000 (UTC) Received: from rules.brq.redhat.com (unknown [10.45.242.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D86818EC7; Wed, 8 Mar 2023 17:03:28 +0000 (UTC) From: Vladis Dronov To: Herbert Xu , "David S . Miller" , Stephan Mueller Cc: Nicolai Stange , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Vladis Dronov Subject: [PATCH] crypto: jitter - panic on runtime health test failures in FIPS mode Date: Wed, 8 Mar 2023 18:02:33 +0100 Message-Id: <20230308170233.19475-1-vdronov@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759820581032319971?= X-GMAIL-MSGID: =?utf-8?q?1759820581032319971?= A FIPS certification lab has noted that the kernel doesn't go to error state upon failure of the RCT and APT health tests. Add a panic() call in FIPS mode to jent_kcapi_random(). Revert b454fb702515 ("crypto: jitter - don't limit ->health_failure check to FIPS mode") for this partially. Signed-off-by: Vladis Dronov --- crypto/jitterentropy-kcapi.c | 8 ++++++++ crypto/jitterentropy.h | 1 + 2 files changed, 9 insertions(+) diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c index 2d115bec15ae..9c692119d926 100644 --- a/crypto/jitterentropy-kcapi.c +++ b/crypto/jitterentropy-kcapi.c @@ -37,6 +37,7 @@ * DAMAGE. */ +#include #include #include #include @@ -59,6 +60,11 @@ void jent_zfree(void *ptr) kfree_sensitive(ptr); } +int jent_fips_enabled(void) +{ + return fips_enabled; +} + void jent_panic(char *s) { panic("%s", s); @@ -140,6 +146,8 @@ static int jent_kcapi_random(struct crypto_rng *tfm, /* Return a permanent error in case we had too many resets in a row. */ if (rng->reset_cnt > (1<<10)) { + if (jent_fips_enabled()) + jent_panic("jitterentropy: Too many RCT/APT health test failures\n"); ret = -EFAULT; goto out; } diff --git a/crypto/jitterentropy.h b/crypto/jitterentropy.h index b7397b617ef0..c83fff32d130 100644 --- a/crypto/jitterentropy.h +++ b/crypto/jitterentropy.h @@ -2,6 +2,7 @@ extern void *jent_zalloc(unsigned int len); extern void jent_zfree(void *ptr); +extern int jent_fips_enabled(void); extern void jent_panic(char *s); extern void jent_memcpy(void *dest, const void *src, unsigned int n); extern void jent_get_nstime(__u64 *out);