Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1575388imu; Sun, 18 Nov 2018 04:49:03 -0800 (PST) X-Google-Smtp-Source: AJdET5dk26wRqvmbYA62tCr4mpmqBv3hApWqIeH533e3wRWwFT7u0SA0PC3a4XT9QqIenLHVIb4C X-Received: by 2002:a63:4665:: with SMTP id v37mr16703630pgk.425.1542545343414; Sun, 18 Nov 2018 04:49:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542545343; cv=none; d=google.com; s=arc-20160816; b=rGaB5Gk4yHzM+aDMaZXtJ7IGCIXz62Q/aOo/1F05BT3aql5WrH1vfV0Qr3lQQrkOs+ nnbBa7lVHW4SDcY3ahGaLYcIjyzGVhr3Gv/g+5hM4Y4sR8KYmhvn/sJ53VK4SW3m7qhQ QTRF1iC5gntW9m6ZchU6tJDKKlyv9QP6WWAtdoGY2aRDFLCZkfNfbrqBBLY5MkvmcWwR e9d+ZqLEYyfA04fTwts+GbYU6nU//kf0peUsZzxUW+MbLaTdrBMJxJdxtZ3Fo6U1PLrH 8BDdos0+zox9Ngj87dTvMcIaR/WQj8Eb6pUbE0641XF05IKrGW76+cyMhCZynoyWHuZS GWEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=TRvUGvGrL75TScV6x64m+TKOU/es0R10t/xxHAb5/jE=; b=KZBOubQEC73hdrouBZoPRhpjxRlcRIPeiE5iI+GQQS9OGTgNGB6NMZFIOokGX7xcaA ftLcEnWtx5DKshCfwrnfiA/Adox6xnC0oFrXfUqdzgSE7J9CDxy5Ghm7DzIF2Areos2u Aa/kVOSTH3jQC7IoM4CqT1S4u05LqpYabGiQu7NVWWYsgdtJIniS2JGMwgyjvjK8dw5r 6c/YUJ74pSkHaD+aJTIYlPKuqeoNA5UPVO0b/bOl9eYZXRLYx+NCqo8Bjfbiy4LU61CW LEWm2PQ5j1YP3yR2z3g4QygQymBYinpjyCGmJY01LS5oA9rTpnli6JcJNeVFfdVDx+JF Pv5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h22-v6si40199566pli.240.2018.11.18.04.48.46; Sun, 18 Nov 2018 04:49:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726964AbeKRXIS (ORCPT + 99 others); Sun, 18 Nov 2018 18:08:18 -0500 Received: from mga07.intel.com ([134.134.136.100]:30751 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726180AbeKRXIS (ORCPT ); Sun, 18 Nov 2018 18:08:18 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Nov 2018 04:48:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,248,1539673200"; d="scan'208";a="280962954" Received: from tmuluk-mobl4.ger.corp.intel.com (HELO localhost) ([10.249.254.142]) by fmsmga005.fm.intel.com with ESMTP; 18 Nov 2018 04:47:58 -0800 From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: linux-security-module@vger.kernel.org, James Bottomley , Tomas Winkler , Tadeusz Struk , Stefan Berger , Nayna Jain , Jarkko Sakkinen , Jason Gunthorpe , linux-arm-kernel@lists.infradead.org (moderated list:ARM/Microchip (AT91) SoC support), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 00/17] Removed nested TPM operations Date: Sun, 18 Nov 2018 14:47:33 +0200 Message-Id: <20181118124753.18613-1-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [was Detach TPM space code out of the tpm_transmit() flow but the scope expanded a bit.] Make the changes necessary to detach TPM space code and TPM activation code out of the tpm_transmit() flow because of both of these can cause nested tpm_transmit() calls. The nesteds calls make the whole flow hard to maintain, and thus, it is better to just fix things now before this turns into a bigger mess. v9: * Fixed again tpm_try_get_ops(). * Added missing reviewed-by's. v8: * Re-add the check for ret < 0 after calling tpm_try_transmit() that was dropped by mistake while moving code. * Fix error fallback for tpm_try_get_ops() when tpm_chip_start() fails. v7: * Reorganize series so that more trivial and self-contained changes are in the head. v6: * When tpm_validate_commmand() was moved to tpm2-space.c, the struct for the TPM header was incorrectly declared as struct tpm_input_header. * Fix return value in tpm_validate_command(). v5: * Add the missing rev's from Stefan Berger. v4: * Return 0 from pcrs_show() when tpm1_pcr_read() fails. * Fix error handling flow in tpm_try_transmit(). * Replace struct tpm_input_header and struct tpm_output_header with struct tpm_header. v3: * Encapsulate power gating code to tpm_chip_start() and tpm_chip_stop(). * Move TPM power gating code and locking to tpm_try_get_ops() and tpm_put_ops(). * Call power gating code directly in tpm_chip_register() and tpm2_del_space(). v2: * Print tpm2_commit_space() error inside tpm2_commit_space() * Error code was not printed when recv() callback failed. It is fixed in this version. * Added a patch that removes @space from tpm_transmit(). * Fixed a regression in earlier series. Forgot to amend the change from the staging area that renames NESTED to UNLOCKED in tpm2-space.c. Jarkko Sakkinen (17): tpm: use tpm_buf in tpm_transmit_cmd() as the IO parameter tpm: fix invalid return value in pubek_show() tpm: return 0 from pcrs_show() when tpm1_pcr_read() fails tpm: print tpm2_commit_space() error inside tpm2_commit_space() tpm: declare struct tpm_header tpm: access command header through struct in tpm_try_transmit() tpm: encapsulate tpm_dev_transmit() tpm: call tpm2_flush_space() on error in tpm_try_transmit() tpm: clean up tpm_try_transmit() error handling flow tpm: move tpm_validate_commmand() to tpm2-space.c tpm: move TPM space code out of tpm_transmit() tpm: remove @space from tpm_transmit() tpm: use tpm_try_get_ops() in tpm-sysfs.c. tpm: remove TPM_TRANSMIT_UNLOCKED flag tpm: introduce tpm_chip_start() and tpm_chip_stop() tpm: take TPM chip power gating out of tpm_transmit() tpm: remove @flags from tpm_transmit() drivers/char/tpm/tpm-chip.c | 109 ++++++++++++ drivers/char/tpm/tpm-dev-common.c | 45 ++++- drivers/char/tpm/tpm-interface.c | 264 ++++++------------------------ drivers/char/tpm/tpm-sysfs.c | 138 ++++++++++------ drivers/char/tpm/tpm.h | 64 +++----- drivers/char/tpm/tpm1-cmd.c | 28 +--- drivers/char/tpm/tpm2-cmd.c | 72 +++----- drivers/char/tpm/tpm2-space.c | 93 ++++++++--- drivers/char/tpm/tpm_i2c_atmel.c | 5 +- drivers/char/tpm/tpm_vtpm_proxy.c | 12 +- drivers/char/tpm/xen-tpmfront.c | 2 +- 11 files changed, 410 insertions(+), 422 deletions(-) -- 2.19.1