From patchwork Fri Nov 24 02:02:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 169151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp841455vqx; Thu, 23 Nov 2023 18:03:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IGn1yDNm/7Vc8datqJal90SYhRbbD9mMLK+IUW2MufyFrFMXiMRfDKnW5VOilDNIDBWxIwh X-Received: by 2002:a17:902:e887:b0:1cc:3f10:4175 with SMTP id w7-20020a170902e88700b001cc3f104175mr1403800plg.28.1700791431485; Thu, 23 Nov 2023 18:03:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700791431; cv=none; d=google.com; s=arc-20160816; b=C6Z3CR88RSNTxKduQzByfvAQcttvVEb1FkVWuwjWOTv/wJovKfaV4vi5c3AvKom1+n pF0lqkSmUBadWeyDV3sijFftqggUN9AOKY8bUpw1P0xbyLmt+z86MypjUIoYCS3sTJwI WfN+jLTPDIRFvHEsWKtSHIHQJmYxkKm4KCvRxfcWxZJJW25f7/UwqYmB5ivH2tcXMwUw iVw4ItVUEfePU4cN4Ro5VCwYJuZ8cmrANxA/fWYMevyHqGXt2UQb6PDlnbFhs1J/6MF+ 5zCCWYQXvuRun9DRm0CYhhgh3VSpaE7L6LWDrLB9CO/Rn1bIfsWRCAcF6TQF+iZHHTku +apQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kOAtVd6qL/8CGFuNUFJVoqmZr55CLe6UG3BZyjEVgdM=; fh=RBX0EO7BCt4n4lnvPBYFN24o6jFly+IlKRm41n8yo0s=; b=w1YCFmiQKaoaf4A2U++PvlZq1FASc5z5je9yz3Z2eMAqPnJBhdGqUV13Z/g1iGHi9T 4G11+IVpB3dPSq4BNHOr/CfO3vV3cz2LY5WFAVzTvuOUXXfcJOfMM5DWPF7urZ9A6GID Gd5hEpNhH1CJXu6QFAI+NRD/1b7hF/m64bdc60Ma2uOzqjD5sE+5Rs+SYIyB51AcOA4m rh3O1gmufAXe+uBxtQJroIdu4ZsFbjoBpxvnyc1jgWCertQ3IVc42Ojxfl/cLmjko4O4 A32XyWfi7UXNjhzP0ZXzx0bDfv70zFEgB/cdceJx+PSQdR/1ahjKeFt4HyZvWfqiITFR J+bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=CS57FfiF; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id u11-20020a170903124b00b001cf7c07be54si2372113plh.507.2023.11.23.18.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 18:03:51 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=CS57FfiF; 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=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 C1FC081D2D5A; Thu, 23 Nov 2023 18:03:03 -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 S231255AbjKXCCy (ORCPT + 99 others); Thu, 23 Nov 2023 21:02:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230323AbjKXCCr (ORCPT ); Thu, 23 Nov 2023 21:02:47 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12D9810DB for ; Thu, 23 Nov 2023 18:02:48 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58686C433C7; Fri, 24 Nov 2023 02:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700791367; bh=3Y6FhYUfs1OMTK8TpsSil3XSBqWxbXFTm8ChxAufa00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CS57FfiF6xyUpfkjxKHWVusOK8aWst3DmyHJFLm6QPQxMFqMuOr8gK4jYcD6TXcMr DfWnvezfb1RcUBgtfGeIcYJl+OIW7ZxB4hvmJbRVxitbKSXjrKDjAWJTF7wL5sXumv AlyrtCew6k1NuChpTHy/e8ssXjo2Ppf+sgIffvqNgKm/vfZWNyvT/AtBUvBbsPhlN4 nE02hD89e9aah8t/i8TNksbTR/fUl2D08TkglYm/aW6OkchJ3LwevtExVY4MXsDoOj Tg3Gqes2Q7FKVewC+Rtp4fK+PlKpB3DRaVC3sA5dcN5CcqyuIsGtGzt9C84U92ltpj HSgQ0HoGsxXsw== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jarkko Sakkinen , James Bottomley , William Roberts , Stefan Berger , David Howells , Jason Gunthorpe , Mimi Zohar , Mario Limonciello , Jerry Snitselaar Subject: [PATCH v6 2/8] tpm: Remove tpm_send() Date: Fri, 24 Nov 2023 04:02:31 +0200 Message-ID: <20231124020237.27116-3-jarkko@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124020237.27116-1-jarkko@kernel.org> References: <20231124020237.27116-1-jarkko@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.2 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, URIBL_BLOCKED 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]); Thu, 23 Nov 2023 18:03:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783409076005794001 X-GMAIL-MSGID: 1783409076005794001 Open code the last remaining call site for tpm_send(). Signed-off-by: Jarkko Sakkinen Reviewed-by: Stefan Berger --- v1 [2023-11-21]: A new patch. --- drivers/char/tpm/tpm-interface.c | 25 ----------------------- include/linux/tpm.h | 5 ----- security/keys/trusted-keys/trusted_tpm1.c | 14 +++++++++++-- 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 66b16d26eecc..163ae247bff2 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -342,31 +342,6 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, } EXPORT_SYMBOL_GPL(tpm_pcr_extend); -/** - * tpm_send - send a TPM command - * @chip: a &struct tpm_chip instance, %NULL for the default chip - * @cmd: a TPM command buffer - * @buflen: the length of the TPM command buffer - * - * Return: same as with tpm_transmit_cmd() - */ -int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen) -{ - struct tpm_buf buf; - int rc; - - chip = tpm_find_get_ops(chip); - if (!chip) - return -ENODEV; - - buf.data = cmd; - rc = tpm_transmit_cmd(chip, &buf, 0, "attempting to a send a command"); - - tpm_put_ops(chip); - return rc; -} -EXPORT_SYMBOL_GPL(tpm_send); - int tpm_auto_startup(struct tpm_chip *chip) { int rc; diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 6588ca87cf93..d9d645e9c52c 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -422,7 +422,6 @@ extern int tpm_pcr_read(struct tpm_chip *chip, u32 pcr_idx, struct tpm_digest *digest); extern int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, struct tpm_digest *digests); -extern int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen); extern int tpm_get_random(struct tpm_chip *chip, u8 *data, size_t max); extern struct tpm_chip *tpm_default_chip(void); void tpm2_flush_context(struct tpm_chip *chip, u32 handle); @@ -443,10 +442,6 @@ static inline int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, return -ENODEV; } -static inline int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen) -{ - return -ENODEV; -} static inline int tpm_get_random(struct tpm_chip *chip, u8 *data, size_t max) { return -ENODEV; diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c index aa108bea6739..37bce84eef99 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -356,17 +356,27 @@ static int TSS_checkhmac2(unsigned char *buffer, */ int trusted_tpm_send(unsigned char *cmd, size_t buflen) { + struct tpm_buf buf; int rc; if (!chip) return -ENODEV; + rc = tpm_try_get_ops(chip); + if (rc) + return rc; + + buf.flags = 0; + buf.data = cmd; dump_tpm_buf(cmd); - rc = tpm_send(chip, cmd, buflen); + rc = tpm_transmit_cmd(chip, &buf, 4, "sending data"); dump_tpm_buf(cmd); + if (rc > 0) - /* Can't return positive return codes values to keyctl */ + /* TPM error */ rc = -EPERM; + + tpm_put_ops(chip); return rc; } EXPORT_SYMBOL_GPL(trusted_tpm_send);