From patchwork Tue Oct 10 23:16:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 151041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp193022vqb; Tue, 10 Oct 2023 16:16:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHvLwEs0KKPDqBsNHHLTuRZ0OsuKT2nJUsm1R6wIk5jHO7FovFXcRQNKugplF7QcG6j746+ X-Received: by 2002:a05:6358:c10a:b0:14a:cca4:55d7 with SMTP id fh10-20020a056358c10a00b0014acca455d7mr15983614rwb.3.1696979802189; Tue, 10 Oct 2023 16:16:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696979802; cv=none; d=google.com; s=arc-20160816; b=dyydo2LqmOipDV5UcTFSJBcTewPmi20EbgyHzwomNJT6ATsVTws399kbfPML1z7o8W hHFMZ8azCveLl40DAm5I6UrTVLzGSBlqAM5MT7JEktGnTzPgw6q6jTX13XPmQxT3xJ3G 70qnZbJoYSifRgvBAdY0GLnEGMxzjHrZD/xY/CGYyBXfeMg/S31MiEGhAkjmUbyWS7gc +t1Bo5m3GS9aPAiCTsqKE/snqYJhSkQ1jt3PpHeVomKwSffvBGIyhoUAa1+HZPpL3mUu pcVyki4aKJG3kAzISJ5p6hWAjmAXnP9iA4QCjeIyCBOL+AMpaqM/lvgw369Uspjlky6E MQ9A== 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=1/t5pboWPEjC5+mEWVHMbZhc4Ve/FsgJR1rAI9u7sMw=; fh=Jsi2hACG1O9/UE06pwXOvfz6djAeuvRlW/S2PtS9YDs=; b=cWBqVgxFJ0p9e2/ipsGXL66JPILKR9JDEBB0ZQ2FKOn+qZ4R0xmswY1sJzKV5Odhhi V6eMOlVrrWnHz3E0gSlf22RhWl+sjyzsIhIdIUMGTsglEcDCrKYWMZJYTpbrB9Gl98aB VLhWBtXG6MXDxEHt2BcM6vkPM3n117XhBlYm6hU8EE0WLRPzIjmKI62ynMUoxhPxq6qQ 8TNSsVLQCFHYT2zWpG398KJPb1NJaLM5yL6V8GDqy2spFt9QGI9cygUXGEToECsRtm3g A3cESJyweXxDuq5wpOj//a8X/WS86WFY7ZTP9EvFzpOuaEkFN3YQqXgQuOygz4Es+Y4d cmSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pXMC74Z2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id p5-20020a17090a74c500b00263eb5054fdsi15019979pjl.32.2023.10.10.16.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 16:16:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pXMC74Z2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 4921982E2970; Tue, 10 Oct 2023 16:16:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229567AbjJJXQY (ORCPT + 19 others); Tue, 10 Oct 2023 19:16:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbjJJXQX (ORCPT ); Tue, 10 Oct 2023 19:16:23 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F5888E; Tue, 10 Oct 2023 16:16:22 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23AD1C433C7; Tue, 10 Oct 2023 23:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696979781; bh=+/tFFsbWCbzFmHJU9b80+XvPt1sCZXKDdVVDEtowj5w=; h=From:To:Cc:Subject:Date:From; b=pXMC74Z2Goa7waeHAX/KsqDoV1yCMsrupkzcpVrj5XXkaT3LTE7a9taVjXKYBTs1z wF60FN1h8iUIy73IMhLuofGTHlv1Z3ma9CHfpdGCtHeczFeXQITbuXWo2qR2qW7OKX 8CwabQbTWuOoRCytmGKySX+cP90SJgKYY4o4jSmaVD/CtNtbx0XR+UfxyrIQ6aEmk2 8HZN+0ubURxTGMGvJqmGKefQGxIvMbbX4BNv5Wh5puB03yEphVNrg46Tu9g/kHSzp4 XefdyPR+/1YqAktmK4M23sPvL29jBcAPojx0CoFY70NFm5qzU0nP2SGw/9t1BYgqpE AwFNBCACjQJ7g== From: Jarkko Sakkinen To: keyrings@vger.kernel.org Cc: Jarkko Sakkinen , Linus Torvalds , stable@vger.kernel.org, James Bottomley , Mimi Zohar , David Howells , Paul Moore , James Morris , "Serge E. Hallyn" , Sumit Garg , linux-integrity@vger.kernel.org (open list:KEYS-TRUSTED), linux-security-module@vger.kernel.org (open list:SECURITY SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] KEYS: trusted: Rollback init_trusted() consistently Date: Wed, 11 Oct 2023 02:16:16 +0300 Message-Id: <20231010231616.3122392-1-jarkko@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email 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 (morse.vger.email [0.0.0.0]); Tue, 10 Oct 2023 16:16:40 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779412293082562817 X-GMAIL-MSGID: 1779412293082562817 Do bind neither static calls nor trusted_key_exit() before a successful init, in order to maintain a consistent state. In addition, depart the init_trusted() in the case of a real error (i.e. getting back something else than -ENODEV). Reported-by: Linus Torvalds Closes: https://lore.kernel.org/linux-integrity/CAHk-=whOPoLaWM8S8GgoOPT7a2+nMH5h3TLKtn=R_3w4R1_Uvg@mail.gmail.com/ Cc: stable@vger.kernel.org # v5.13+ Fixes: 5d0682be3189 ("KEYS: trusted: Add generic trusted keys framework") Signed-off-by: Jarkko Sakkinen --- security/keys/trusted-keys/trusted_core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c index 85fb5c22529a..fee1ab2c734d 100644 --- a/security/keys/trusted-keys/trusted_core.c +++ b/security/keys/trusted-keys/trusted_core.c @@ -358,17 +358,17 @@ static int __init init_trusted(void) if (!get_random) get_random = kernel_get_random; - static_call_update(trusted_key_seal, - trusted_key_sources[i].ops->seal); - static_call_update(trusted_key_unseal, - trusted_key_sources[i].ops->unseal); - static_call_update(trusted_key_get_random, - get_random); - trusted_key_exit = trusted_key_sources[i].ops->exit; - migratable = trusted_key_sources[i].ops->migratable; - ret = trusted_key_sources[i].ops->init(); - if (!ret) + if (!ret) { + static_call_update(trusted_key_seal, trusted_key_sources[i].ops->seal); + static_call_update(trusted_key_unseal, trusted_key_sources[i].ops->unseal); + static_call_update(trusted_key_get_random, get_random); + + trusted_key_exit = trusted_key_sources[i].ops->exit; + migratable = trusted_key_sources[i].ops->migratable; + } + + if (!ret || ret != -ENODEV) break; }