Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932174AbdC1L2T (ORCPT ); Tue, 28 Mar 2017 07:28:19 -0400 Received: from smtp2.infineon.com ([217.10.52.18]:15014 "EHLO smtp2.infineon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755471AbdC1L2S (ORCPT ); Tue, 28 Mar 2017 07:28:18 -0400 X-SBRS: None From: To: CC: , , , , , Subject: RE: [PATCH] tpm: do handle area size validation only when TPM space used Thread-Topic: [PATCH] tpm: do handle area size validation only when TPM space used Thread-Index: AQHSp62O7a4pJDZDK0eg4IFHIVROP6GqHRdQ Date: Tue, 28 Mar 2017 11:27:53 +0000 Message-ID: <93b2b783656c400ebea13a9eeec48097@MUCSE603.infineon.com> References: <20170326210815.21252-1-jarkko.sakkinen@iki.fi> <20170328102453.hvyc3a4vmrk3lyzu@intel.com> In-Reply-To: <20170328102453.hvyc3a4vmrk3lyzu@intel.com> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [172.23.8.247] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id v2SBVb1O015273 Content-Length: 2231 Lines: 70 Yes, this fixes the issue for me. Thanks. Alexander > -----Original Message----- > From: Jarkko Sakkinen [mailto:jarkko.sakkinen@linux.intel.com] > Sent: Tuesday, March 28, 2017 12:25 PM > To: Steffen Alexander (IFAG CCS ESS D SW A) > Cc: tpmdd-devel@lists.sourceforge.net; linux-security- > module@vger.kernel.org; Peter Huewe; Marcel Selhorst; Jason Gunthorpe; > open list > Subject: Re: [PATCH] tpm: do handle area size validation only when TPM > space used > > So do you need this or not? > > /Jarkko > > On Mon, Mar 27, 2017 at 12:08:15AM +0300, Jarkko Sakkinen wrote: > > In order to not cause backwards compatibility issues with > > /dev/tpm0 disable handle area size validation if tpm_transmit is not > > called with a TPM space. > > > > Signed-off-by: Jarkko Sakkinen > > --- > > drivers/char/tpm/tpm-interface.c | 9 +++++++-- > > 1 file changed, 7 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/char/tpm/tpm-interface.c > > b/drivers/char/tpm/tpm-interface.c > > index bf0c3fa..158c1db 100644 > > --- a/drivers/char/tpm/tpm-interface.c > > +++ b/drivers/char/tpm/tpm-interface.c > > @@ -328,7 +328,9 @@ unsigned long tpm_calc_ordinal_duration(struct > > tpm_chip *chip, } EXPORT_SYMBOL_GPL(tpm_calc_ordinal_duration); > > > > -static bool tpm_validate_command(struct tpm_chip *chip, const u8 > > *cmd, > > +static bool tpm_validate_command(struct tpm_chip *chip, > > + struct tpm_space *space, > > + const u8 *cmd, > > size_t len) > > { > > const struct tpm_input_header *header = (const void *)cmd; @@ - > 340,6 > > +342,9 @@ static bool tpm_validate_command(struct tpm_chip *chip, > const u8 *cmd, > > if (len < TPM_HEADER_SIZE) > > return false; > > > > + if (!space) > > + return true; > > + > > if (chip->flags & TPM_CHIP_FLAG_TPM2 && chip->nr_commands) { > > cc = be32_to_cpu(header->ordinal); > > > > @@ -386,7 +391,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct > tpm_space *space, > > unsigned long stop; > > bool need_locality; > > > > - if (!tpm_validate_command(chip, buf, bufsiz)) > > + if (!tpm_validate_command(chip, space, buf, bufsiz)) > > return -EINVAL; > > > > if (bufsiz > TPM_BUFSIZE) > > -- > > 2.9.3 > >