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_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 620DBECDE4B for ; Thu, 8 Nov 2018 14:55:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B63C2081D for ; Thu, 8 Nov 2018 14:55:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B63C2081D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727171AbeKIAbR (ORCPT ); Thu, 8 Nov 2018 19:31:17 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:47360 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726672AbeKIAbQ (ORCPT ); Thu, 8 Nov 2018 19:31:16 -0500 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wA8EsqiN028968 for ; Thu, 8 Nov 2018 09:55:23 -0500 Received: from e16.ny.us.ibm.com (e16.ny.us.ibm.com [129.33.205.206]) by mx0b-001b2d01.pphosted.com with ESMTP id 2nmqan80ts-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 08 Nov 2018 09:55:23 -0500 Received: from localhost by e16.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Nov 2018 14:55:22 -0000 Received: from b01cxnp23032.gho.pok.ibm.com (9.57.198.27) by e16.ny.us.ibm.com (146.89.104.203) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 8 Nov 2018 14:55:18 -0000 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id wA8EtHdT29294814 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 8 Nov 2018 14:55:18 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DAA47B2065; Thu, 8 Nov 2018 14:55:17 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 995ADB2064; Thu, 8 Nov 2018 14:55:15 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Thu, 8 Nov 2018 14:55:15 +0000 (GMT) Subject: Re: [PATCH v5 04/17] tpm: call tpm2_flush_space() on error in tpm_try_transmit() To: Jarkko Sakkinen , linux-integrity@vger.kernel.org Cc: linux-security-module@vger.kernel.org, James Bottomley , Tomas Winkler , Tadeusz Struk , Stefan Berger , Nayna Jain , stable@vger.kernel.org, Peter Huewe , Jason Gunthorpe , Arnd Bergmann , Greg Kroah-Hartman , open list References: <20181108141541.12832-1-jarkko.sakkinen@linux.intel.com> <20181108141541.12832-5-jarkko.sakkinen@linux.intel.com> From: Stefan Berger Date: Thu, 8 Nov 2018 09:55:15 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <20181108141541.12832-5-jarkko.sakkinen@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-MW X-TM-AS-GCONF: 00 x-cbid: 18110814-0072-0000-0000-000003C58867 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010008; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000268; SDB=6.01114486; UDB=6.00577118; IPR=6.00894585; MB=3.00024075; MTD=3.00000008; XFM=3.00000015; UTC=2018-11-08 14:55:21 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18110814-0073-0000-0000-00004A0AE812 Message-Id: <5f9a97a0-c4e1-41ca-d590-dc0eec2dbb82@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-11-08_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811080127 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/8/18 9:15 AM, Jarkko Sakkinen wrote: > Always call tpm2_flush_space() on failure in tpm_try_transmit() so that > the volatile memory of the TPM gets cleared. If /dev/tpm0 does not have > sufficient permissions (usually it has), this could lead to the leakage > of TPM objects. Through /dev/tpmrm0 this issue does not raise any new > security concerns. > > Cc: stable@vger.kernel.org > Fixes: 745b361e989a ("tpm:tpm: infrastructure for TPM spaces") > Signed-off-by: Jarkko Sakkinen Reviewed-by: Stefan Berger > --- > drivers/char/tpm/tpm-interface.c | 33 +++++++++++++++----------------- > drivers/char/tpm/tpm.h | 1 + > drivers/char/tpm/tpm2-space.c | 2 +- > 3 files changed, 17 insertions(+), 19 deletions(-) > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index 64510ed81b46..c9efd1b9fd2c 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -224,14 +224,14 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, > > rc = tpm2_prepare_space(chip, space, ordinal, buf); > if (rc) > - goto out; > + goto out_idle; > > rc = chip->ops->send(chip, buf, count); > if (rc < 0) { > if (rc != -EPIPE) > dev_err(&chip->dev, > "%s: tpm_send: error %d\n", __func__, rc); > - goto out; > + goto out_space; > } > > if (chip->flags & TPM_CHIP_FLAG_IRQ) > @@ -247,7 +247,7 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, > if (chip->ops->req_canceled(chip, status)) { > dev_err(&chip->dev, "Operation Canceled\n"); > rc = -ECANCELED; > - goto out; > + goto out_space; > } > > tpm_msleep(TPM_TIMEOUT_POLL); > @@ -257,30 +257,27 @@ static ssize_t tpm_try_transmit(struct tpm_chip *chip, > chip->ops->cancel(chip); > dev_err(&chip->dev, "Operation Timed out\n"); > rc = -ETIME; > - goto out; > + goto out_space; > > out_recv: > len = chip->ops->recv(chip, buf, bufsiz); > if (len < 0) { > rc = len; > - dev_err(&chip->dev, > - "tpm_transmit: tpm_recv: error %d\n", rc); > - goto out; > - } else if (len < TPM_HEADER_SIZE) { > + dev_err(&chip->dev, "tpm_transmit: tpm_recv: error %d\n", rc); > + } else if (len < TPM_HEADER_SIZE || len != be32_to_cpu(header->length)) > rc = -EFAULT; > - goto out; > - } > > - if (len != be32_to_cpu(header->length)) { > - rc = -EFAULT; > - goto out; > +out_space: > + if (rc) { > + tpm2_flush_space(chip); > + } else { > + rc = tpm2_commit_space(chip, space, ordinal, buf, &len); > + if (rc) > + dev_err(&chip->dev, "tpm2_commit_space: error %d\n", > + rc); > } > > - rc = tpm2_commit_space(chip, space, ordinal, buf, &len); > - if (rc) > - dev_err(&chip->dev, "tpm2_commit_space: error %d\n", rc); > - > -out: > +out_idle: > /* may fail but do not override previous error value in rc */ > tpm_go_idle(chip, flags); > > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 49bca4d1e786..229ac42b644e 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -579,6 +579,7 @@ int tpm2_probe(struct tpm_chip *chip); > int tpm2_find_cc(struct tpm_chip *chip, u32 cc); > int tpm2_init_space(struct tpm_space *space); > void tpm2_del_space(struct tpm_chip *chip, struct tpm_space *space); > +void tpm2_flush_space(struct tpm_chip *chip); > int tpm2_prepare_space(struct tpm_chip *chip, struct tpm_space *space, u32 cc, > u8 *cmd); > int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space, > diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c > index 1131a8e7b79b..d53c882268ff 100644 > --- a/drivers/char/tpm/tpm2-space.c > +++ b/drivers/char/tpm/tpm2-space.c > @@ -162,7 +162,7 @@ static int tpm2_save_context(struct tpm_chip *chip, u32 handle, u8 *buf, > return 0; > } > > -static void tpm2_flush_space(struct tpm_chip *chip) > +void tpm2_flush_space(struct tpm_chip *chip) > { > struct tpm_space *space = &chip->work_space; > int i;