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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 49DCFC3279B for ; Mon, 2 Jul 2018 15:12:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 038F6250F3 for ; Mon, 2 Jul 2018 15:12:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 038F6250F3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.vnet.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 S1752342AbeGBPME (ORCPT ); Mon, 2 Jul 2018 11:12:04 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:49358 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752223AbeGBPMC (ORCPT ); Mon, 2 Jul 2018 11:12:02 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w62F9IVJ126997 for ; Mon, 2 Jul 2018 11:12:01 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2jykxbf0j2-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 02 Jul 2018 11:12:01 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Jul 2018 16:11:59 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 2 Jul 2018 16:11:57 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w62FBuEG12845210 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 2 Jul 2018 15:11:56 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BF3FD4204F; Mon, 2 Jul 2018 16:11:39 +0100 (BST) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2927D42045; Mon, 2 Jul 2018 16:11:39 +0100 (BST) Received: from localhost.localdomain (unknown [9.80.97.108]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 2 Jul 2018 16:11:39 +0100 (BST) Subject: Re: [PATCH v7 5/5] ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead From: Mimi Zohar To: Stefan Berger , linux-integrity@vger.kernel.org, jarkko.sakkinen@linux.intel.com Cc: linux-kernel@vger.kernel.org Date: Mon, 02 Jul 2018 11:11:44 -0400 In-Reply-To: <20180626190933.2508821-6-stefanb@linux.vnet.ibm.com> References: <20180626190933.2508821-1-stefanb@linux.vnet.ibm.com> <20180626190933.2508821-6-stefanb@linux.vnet.ibm.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 18070215-0020-0000-0000-000002A23C94 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18070215-0021-0000-0000-000020EE4E8D Message-Id: <1530544304.3709.40.camel@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-07-02_05:,, 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-1806210000 definitions=main-1807020173 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stefan, On Tue, 2018-06-26 at 15:09 -0400, Stefan Berger wrote: > Get rid of ima_used_chip and use ima_tpm_chip variable instead for > determining whether to use the TPM chip. I don't see a need for separating this change from the previous patch. Could you squash this patch with the previous one? As Jarkko has already queued the TPM patches, there's no need for posting them.  Posting just this one IMA patch is fine. thanks! Mimi > Signed-off-by: Stefan Berger > Acked-by: Jarkko Sakkinen > --- > security/integrity/ima/ima.h | 1 - > security/integrity/ima/ima_crypto.c | 2 +- > security/integrity/ima/ima_init.c | 7 ++----- > security/integrity/ima/ima_queue.c | 2 +- > 4 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h > index 35409461a3f2..2ab1affffa36 100644 > --- a/security/integrity/ima/ima.h > +++ b/security/integrity/ima/ima.h > @@ -53,7 +53,6 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 }; > extern int ima_policy_flag; > > /* set during initialization */ > -extern int ima_used_chip; > extern int ima_hash_algo; > extern int ima_appraise; > extern struct tpm_chip *ima_tpm_chip; > diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c > index 88082f35adb2..7e7e7e7c250a 100644 > --- a/security/integrity/ima/ima_crypto.c > +++ b/security/integrity/ima/ima_crypto.c > @@ -631,7 +631,7 @@ int ima_calc_buffer_hash(const void *buf, loff_t len, > > static void __init ima_pcrread(int idx, u8 *pcr) > { > - if (!ima_used_chip) > + if (!ima_tpm_chip) > return; > > if (tpm_pcr_read(ima_tpm_chip, idx, pcr) != 0) > diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c > index 1437ed3dbccc..faac9ecaa0ae 100644 > --- a/security/integrity/ima/ima_init.c > +++ b/security/integrity/ima/ima_init.c > @@ -26,7 +26,6 @@ > > /* name for boot aggregate entry */ > static const char *boot_aggregate_name = "boot_aggregate"; > -int ima_used_chip; > struct tpm_chip *ima_tpm_chip; > > /* Add the boot aggregate to the IMA measurement list and extend > @@ -65,7 +64,7 @@ static int __init ima_add_boot_aggregate(void) > iint->ima_hash->algo = HASH_ALGO_SHA1; > iint->ima_hash->length = SHA1_DIGEST_SIZE; > > - if (ima_used_chip) { > + if (ima_tpm_chip) { > result = ima_calc_boot_aggregate(&hash.hdr); > if (result < 0) { > audit_cause = "hashing_error"; > @@ -110,9 +109,7 @@ int __init ima_init(void) > int rc; > > ima_tpm_chip = tpm_default_chip(); > - > - ima_used_chip = ima_tpm_chip != NULL; > - if (!ima_used_chip) > + if (!ima_tpm_chip) > pr_info("No TPM chip found, activating TPM-bypass!\n"); > > rc = integrity_init_keyring(INTEGRITY_KEYRING_IMA); > diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c > index c6303fa19a49..b186819bd5aa 100644 > --- a/security/integrity/ima/ima_queue.c > +++ b/security/integrity/ima/ima_queue.c > @@ -142,7 +142,7 @@ static int ima_pcr_extend(const u8 *hash, int pcr) > { > int result = 0; > > - if (!ima_used_chip) > + if (!ima_tpm_chip) > return result; > > result = tpm_pcr_extend(ima_tpm_chip, pcr, hash);