From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELuYeJpYRsrF4ffABxCugXf1YNx2RbuXpOWskQJtxXeZWfMbyGP4cbIkBTrsCKVnGTxhHH7f ARC-Seal: i=1; a=rsa-sha256; t=1519899119; cv=none; d=google.com; s=arc-20160816; b=XMJUt6D5b+WMlApGryQNi84Q26x8LRnjb6tznOd71xRwTptHPVvMx0pRXkrsWAHFoU g3Vf6+b3TS4iATFfvjCBA15c76m3Mab7YmnJ+bz35KtrSi4QfiyuJL+6LVFH7RmPmL/3 l9CoATOVPH0/is6nvmT/aGTy3wYbjHaGhT17RlgSyh1FOcFOMTkfMQzjDpvw30FOwFGW AwOsPP9iqDQGL2a4yjpl46fwBDlFqTGkiYLyCZhHY6W8noJ7wybvB7VEjSmhZFrYlEQp xddwwA1CWMlrO77zXlLgrT+Hs1D1EWQqB6hxuDRnPrETpaWX7eaxoH+OhPSqWkxz129V KDHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:organization:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :arc-authentication-results; bh=wT8wXIyHvG5LVtFmM8FkB0OlJ+TgdsLkDkNfMUB8IfE=; b=yyyZvPCF30cL9gKEy9zi/hkCKzaKDKpWPeVOmqoSbM/EbGxQOGiLWqTESa3cdpm0D5 IUy583CX6vhMSSv9nFuddPr/x1iZRZB6J7aZo5JqQjCJZiVDIs5UlTbLv59BXJonnsGZ G7RGztWZU+Nz5bCFzwTYu7pHhmZfbbfJvNEP7nPsVFZumEfHSPjvr0RPRgY4RkOoazmM MNM2fPWSwNTz3vSsLzKwzNFQNTZAiOx5VGjTTVJCsGp2/cLAOWN4rqMADI/fuTuC05kh CZJyHCFlRR7bgAXHTI0s5xohSw3zmOklkaRROe9MxprEHS/wFjEaFsCy3wd48+Iin5hv fkDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of jarkko.sakkinen@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=jarkko.sakkinen@linux.intel.com Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of jarkko.sakkinen@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=jarkko.sakkinen@linux.intel.com X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,408,1515484800"; d="scan'208";a="22029564" Date: Thu, 1 Mar 2018 12:11:53 +0200 From: Jarkko Sakkinen To: Jason Gunthorpe Cc: linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, Peter Huewe , Arnd Bergmann , Greg Kroah-Hartman , open list Subject: Re: [PATCH 2/5] tpm: migrate tpm2_shutdown() to use struct tpm_buf Message-ID: <20180301101153.GA32447@linux.intel.com> References: <20180228195819.22231-1-jarkko.sakkinen@linux.intel.com> <20180228195819.22231-3-jarkko.sakkinen@linux.intel.com> <20180228202540.GA19007@ziepe.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180228202540.GA19007@ziepe.ca> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.9.3 (2018-01-21) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1593676060311547889?= X-GMAIL-MSGID: =?utf-8?q?1593729739553671966?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: On Wed, Feb 28, 2018 at 01:25:40PM -0700, Jason Gunthorpe wrote: > On Wed, Feb 28, 2018 at 09:58:15PM +0200, Jarkko Sakkinen wrote: > > In order to make struct tpm_buf the first class object for constructing TPM > > commands, migrate tpm2_shutdown() to use it. In addition, removed the klog > > entry when tpm_transmit_cmd() fails because tpm_tansmit_cmd() already > > prints an error message. > > > > Signed-off-by: Jarkko Sakkinen > > drivers/char/tpm/tpm2-cmd.c | 41 +++++++++++++---------------------------- > > 1 file changed, 13 insertions(+), 28 deletions(-) > > > > diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c > > index 6eeff3a60003..5f92141b1e16 100644 > > +++ b/drivers/char/tpm/tpm2-cmd.c > > @@ -27,10 +27,6 @@ enum tpm2_session_attributes { > > TPM2_SA_CONTINUE_SESSION = BIT(0), > > }; > > > > -struct tpm2_startup_in { > > - __be16 startup_type; > > -} __packed; > > - > > struct tpm2_get_tpm_pt_in { > > __be32 cap_id; > > __be32 property_id; > > @@ -55,7 +51,6 @@ struct tpm2_get_random_out { > > } __packed; > > > > union tpm2_cmd_params { > > - struct tpm2_startup_in startup_in; > > struct tpm2_get_tpm_pt_in get_tpm_pt_in; > > struct tpm2_get_tpm_pt_out get_tpm_pt_out; > > struct tpm2_get_random_in getrandom_in; > > @@ -760,40 +755,30 @@ ssize_t tpm2_get_tpm_pt(struct tpm_chip *chip, u32 property_id, u32 *value, > > } > > EXPORT_SYMBOL_GPL(tpm2_get_tpm_pt); > > > > -#define TPM2_SHUTDOWN_IN_SIZE \ > > - (sizeof(struct tpm_input_header) + \ > > - sizeof(struct tpm2_startup_in)) > > - > > -static const struct tpm_input_header tpm2_shutdown_header = { > > - .tag = cpu_to_be16(TPM2_ST_NO_SESSIONS), > > - .length = cpu_to_be32(TPM2_SHUTDOWN_IN_SIZE), > > - .ordinal = cpu_to_be32(TPM2_CC_SHUTDOWN) > > -}; > > - > > /** > > * tpm2_shutdown() - send shutdown command to the TPM chip > > * > > + * In places where shutdown command is sent there's no much we can do except > > + * print the error code on a system failure. > > + * > > * @chip: TPM chip to use. > > * @shutdown_type: shutdown type. The value is either > > * TPM_SU_CLEAR or TPM_SU_STATE. > > */ > > void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type) > > { > > - struct tpm2_cmd cmd; > > + struct tpm_buf buf; > > int rc; > > > > - cmd.header.in = tpm2_shutdown_header; > > - cmd.params.startup_in.startup_type = cpu_to_be16(shutdown_type); > > - > > - rc = tpm_transmit_cmd(chip, NULL, &cmd, sizeof(cmd), 0, 0, > > - "stopping the TPM"); > > - > > - /* In places where shutdown command is sent there's no much we can do > > - * except print the error code on a system failure. > > - */ > > - if (rc < 0 && rc != -EPIPE) > > - dev_warn(&chip->dev, "transmit returned %d while stopping the TPM", > > - rc); > > + rc = tpm_buf_init(&buf, TPM2_ST_NO_SESSIONS, TPM2_CC_SHUTDOWN); > > + if (rc) { > > + dev_err(&chip->dev, "%s: out of memory", __func__); > > Don't print for out of memory. The kernel already makes lots of > prints for you. Same comment everywhere. > > Jason I'll remove that. Thanks! /Jarkko