From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40518C433DF for ; Thu, 25 Jun 2020 02:54:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 210322078D for ; Thu, 25 Jun 2020 02:54:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389538AbgFYCyO (ORCPT ); Wed, 24 Jun 2020 22:54:14 -0400 Received: from mga12.intel.com ([192.55.52.136]:6872 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389357AbgFYCyO (ORCPT ); Wed, 24 Jun 2020 22:54:14 -0400 IronPort-SDR: Of0YFrmnGS1aSqgskh2RbDeSdvhB5nXC7fbRo/4bRI7BEXBFRC3XSALcUFkWhvuuOw++7gptCp Aei3u5vIK4uw== X-IronPort-AV: E=McAfee;i="6000,8403,9662"; a="124395282" X-IronPort-AV: E=Sophos;i="5.75,277,1589266800"; d="scan'208";a="124395282" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2020 19:54:13 -0700 IronPort-SDR: Rb5biXPkkNbzdDEdfkqxz78d7vhNAIydGqFtQWeRt9iPmK2+ovWiz4OgnGER0Hl+dzipiBce6V 3K1J50dfjA3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,277,1589266800"; d="scan'208";a="479491832" Received: from hluxenbu-mobl.ger.corp.intel.com (HELO localhost) ([10.252.36.218]) by fmsmga005.fm.intel.com with ESMTP; 24 Jun 2020 19:54:09 -0700 Date: Thu, 25 Jun 2020 05:54:08 +0300 From: Jarkko Sakkinen To: Stefan Berger Cc: Stefan Berger , Jiandi An , linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-security-module@vger.kernel.org, "Rafael J . Wysocki" Subject: Re: [PATCH v5 1/2] acpi: Extend TPM2 ACPI table with missing log fields Message-ID: <20200625025408.GD270125@linux.intel.com> References: <20200623120636.1453470-1-stefanb@linux.vnet.ibm.com> <20200623120636.1453470-2-stefanb@linux.vnet.ibm.com> <20200625000021.GC21758@linux.intel.com> <9d94c704-5774-ceeb-e4f3-010f74ffe37b@linux.ibm.com> <20200625023431.GB270125@linux.intel.com> <20200625025251.GC270125@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200625025251.GC270125@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On Thu, Jun 25, 2020 at 05:52:56AM +0300, Jarkko Sakkinen wrote: > On Thu, Jun 25, 2020 at 05:34:38AM +0300, Jarkko Sakkinen wrote: > > On Wed, Jun 24, 2020 at 08:38:25PM -0400, Stefan Berger wrote: > > > On 6/24/20 8:00 PM, Jarkko Sakkinen wrote: > > > > On Tue, Jun 23, 2020 at 08:06:35AM -0400, Stefan Berger wrote: > > > > > From: Stefan Berger > > > > > > > > > > Recent extensions of the TPM2 ACPI table added 3 more fields > > > > > including 12 bytes of start method specific parameters and Log Area > > > > > Minimum Length (u32) and Log Area Start Address (u64). So, we extend > > > > > the existing structure with these fields to allow non-UEFI systems > > > > > to access the TPM2's log. > > > > > > > > > > The specification that has the new fields is the following: > > > > > TCG ACPI Specification > > > > > Family "1.2" and "2.0" > > > > > Version 1.2, Revision 8 > > > > > > > > > > Adapt all existing table size calculations to use > > > > > offsetof(struct acpi_table_tpm2, start_method_specific) > > > > > [where start_method_specific is a newly added field] > > > > > rather than sizeof(struct acpi_table_tpm2) so that the addition > > > > > of the new fields does not affect current systems that may not > > > > > have them. > > > > > > > > > I found at least one regression from this patch. Please remove my > > > > reviewed-by comment form the next version. > > > > > > > > Should have: > > > > > > > > Link: https://trustedcomputinggroup.org/wp-content/uploads/TCG_ACPIGeneralSpecification_v1.20_r8.pdf > > > > > > > > Please, add this. > > > > > > > > > Signed-off-by: Stefan Berger > > > > > Cc: linux-acpi@vger.kernel.org > > > > > Acked-by: Rafael J. Wysocki > > > > > Reviewed-by: Jarkko Sakkinen > > > > > --- > > > > > drivers/char/tpm/tpm_crb.c | 13 ++++++++++--- > > > > > drivers/char/tpm/tpm_tis.c | 4 +++- > > > > > include/acpi/actbl3.h | 5 +++-- > > > > > 3 files changed, 16 insertions(+), 6 deletions(-) > > > > > > > > > > diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c > > > > > index a9dcf31eadd2..0565aa5482f9 100644 > > > > > --- a/drivers/char/tpm/tpm_crb.c > > > > > +++ b/drivers/char/tpm/tpm_crb.c > > > > > @@ -669,7 +669,9 @@ static int crb_acpi_add(struct acpi_device *device) > > > > > status = acpi_get_table(ACPI_SIG_TPM2, 1, > > > > > (struct acpi_table_header **) &buf); > > > > > - if (ACPI_FAILURE(status) || buf->header.length < sizeof(*buf)) { > > > > > + if (ACPI_FAILURE(status) || buf->header.length < > > > > > + offsetof(struct acpi_table_tpm2, > > > > > + start_method_specific)) { > > > > > dev_err(dev, FW_BUG "failed to get TPM2 ACPI table\n"); > > > > > return -EINVAL; > > > > > } > > > > > @@ -684,14 +686,19 @@ static int crb_acpi_add(struct acpi_device *device) > > > > > return -ENOMEM; > > > > > if (sm == ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC) { > > > > > - if (buf->header.length < (sizeof(*buf) + sizeof(*crb_smc))) { > > > > > + if (buf->header.length < > > > > > + (offsetof(struct acpi_table_tpm2, > > > > > + start_method_specific) + > > > > Should be > > > > > > > > offsetof(struct acpti_table_tpm2, log_area_minimum_length) > > > > > > > > > The old code had sizeof(*buf) with buf being 'struct acpi_table_tpm2' and > > > that was equivalent to offsetof(struct acpi_table_tpm2, > > > start_method_specific) since 'start_method_specific' is the first new field > > > that we are adding right here. Also see 3rd paragraph in the patch > > > description. The replacement rule described there should apply to all > > > sizeof() calculations on 'struct acpi_table_tpm2.' > > > > Aren't you ignoring sizeof(*crb_smc) then? > > Duh, it's there I see. Sorry, my mistake. > > Please put the new fields in a separate struct: > > struct acpi_tpm2_phy { > u8 start_method_specific[12]; > u32 log_area_minimum_length; > u64 log_area_start_address; > }; > > This way we don't have to obfuscate all the calculations and zero out > the need for 1/2 in this patch set. Also remark that, if you continue the current patch, that would need tested-by from ARM whereas a new struct does not because the ARM code is intact. /Jarkko