From patchwork Sun Mar 26 21:08:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 743579 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vrqWp0sgfz9s7f for ; Mon, 27 Mar 2017 08:08:38 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1csFOq-0001pj-Jz; Sun, 26 Mar 2017 21:08:32 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1csFOp-0001pd-Ki for tpmdd-devel@lists.sourceforge.net; Sun, 26 Mar 2017 21:08:31 +0000 X-ACL-Warn: Received: from mga11.intel.com ([192.55.52.93]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1csFOo-0002eG-8G for tpmdd-devel@lists.sourceforge.net; Sun, 26 Mar 2017 21:08:31 +0000 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Mar 2017 14:08:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,228,1486454400"; d="scan'208";a="70769844" Received: from mahnkopf-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.49.92]) by orsmga004.jf.intel.com with ESMTP; 26 Mar 2017 14:08:21 -0700 From: Jarkko Sakkinen To: tpmdd-devel@lists.sourceforge.net Date: Mon, 27 Mar 2017 00:08:15 +0300 Message-Id: <20170326210815.21252-1-jarkko.sakkinen@iki.fi> X-Mailer: git-send-email 2.9.3 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1csFOo-0002eG-8G Cc: Jarkko Sakkinen , open list , linux-security-module@vger.kernel.org Subject: [tpmdd-devel] [PATCH] tpm: do handle area size validation only when TPM space used X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net 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)