Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp5653898imm; Tue, 26 Jun 2018 15:27:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKPhZGoc4L/bk9Z+lXk8EHZXmBlY1fmRDO3Rmxz7e8f5X1I4cKEque+VAlKNOCUTxX5pGXR X-Received: by 2002:a17:902:868b:: with SMTP id g11-v6mr3308913plo.305.1530052077881; Tue, 26 Jun 2018 15:27:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530052077; cv=none; d=google.com; s=arc-20160816; b=LZ0x8dY14wWtuifSdqykFuL3OtRXH4u+hR+aiJ1Wx/bYYfwNNeWA9xb5X55yIj8gP9 YD2XPtikkYwtIhoWiEv+Y0A4VKt5SmQQo2fqId751b+rhxltovHnIFPCX1wh1p7DJ92s Q0jLbKv5uhv/xQ7hph/r+JKWxM80B2igCMNxRdhzDBVx4AytfoaEwZe/vyCJvD00oBcU 4R4bf2Z6LDxT2kzP4/2KXQdc+r6IbQI5tS7C2z3p0zU/8U6jDdrjFSPpsgAfWX3kTUzg W5cC7ur6yVgQvHmfCAcTpkRV0zvIpp1S1t5N9gf+Y6eULhl8w87R6HTPi9u1/BahSaHn BNew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from:arc-authentication-results; bh=+Lx7V9MdGvhxt5jZGNty/Tg/aXmqWcw9XdoV2mwg1Zc=; b=X+4g3s3ToNk7QUWDZAwdFvjsytM/ssceknrHA2hGp88ONEEFawmF6b0mmFprL/jD8z QrCkuawYXpR2sxrHW5NqkyIZ71j4oKM/tRCqoTm6Jg7v42XZ32xmWc0ECFas1SyOUBFW qpZDFthvIPyBH6uDAsGBAvakvAnh7OrFSCLVEC/ZNRLrMtv7FavTfEUi1IIkAC/Xna63 dp0p3hXXJ9wIU/8V961/w582G/bMDCHdGuE6mZIJLq5g51EnfA88z4dhMaB1vLHhRQkd /eoQ7HvNqsttOmbURd3w8LgO5KAi/FYY3Q7lBY1PpC8/7yqePSeiWJVmOSee9gu3SzCP ER9Q== 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=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n6-v6si2477463pla.12.2018.06.26.15.27.43; Tue, 26 Jun 2018 15:27:57 -0700 (PDT) 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=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933157AbeFZRYc (ORCPT + 99 others); Tue, 26 Jun 2018 13:24:32 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:51860 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753237AbeFZRXp (ORCPT ); Tue, 26 Jun 2018 13:23:45 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w5QHIk2l121507 for ; Tue, 26 Jun 2018 13:23:44 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0b-001b2d01.pphosted.com with ESMTP id 2jus52sr8v-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Jun 2018 13:23:44 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Jun 2018 11:23:43 -0600 Received: from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 26 Jun 2018 11:23:41 -0600 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w5QHNehe62652560 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 26 Jun 2018 10:23:40 -0700 Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 61BC278064; Tue, 26 Jun 2018 11:23:40 -0600 (MDT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DF57578060; Tue, 26 Jun 2018 11:23:39 -0600 (MDT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 26 Jun 2018 11:23:39 -0600 (MDT) From: Stefan Berger To: linux-integrity@vger.kernel.org, jarkko.sakkinen@linux.intel.com, zohar@linux.vnet.ibm.com Cc: jgg@ziepe.ca, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, Stefan Berger Subject: [PATCH v6 3/5] tpm: Convert tpm_find_get_ops() to use tpm_default_chip() Date: Tue, 26 Jun 2018 13:23:29 -0400 X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180626172331.2505541-1-stefanb@linux.vnet.ibm.com> References: <20180626172331.2505541-1-stefanb@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18062617-0020-0000-0000-00000E3605B1 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009259; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000266; SDB=6.01052673; UDB=6.00539671; IPR=6.00830598; MB=3.00021864; MTD=3.00000008; XFM=3.00000015; UTC=2018-06-26 17:23:42 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18062617-0021-0000-0000-000062132380 Message-Id: <20180626172331.2505541-4-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-06-26_09:,, 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=796 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1806260195 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert tpm_find_get_ops() to use tpm_default_chip() in case no chip is passed in. Signed-off-by: Stefan Berger Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm-chip.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index f551061262c9..b01d34983766 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -124,29 +124,23 @@ EXPORT_SYMBOL_GPL(tpm_default_chip); */ struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip) { - struct tpm_chip *res = NULL; - int chip_num = 0; - int chip_prev; - - mutex_lock(&idr_lock); + int rc; - if (!chip) { - do { - chip_prev = chip_num; - chip = idr_get_next(&dev_nums_idr, &chip_num); - if (chip && !tpm_try_get_ops(chip)) { - res = chip; - break; - } - } while (chip_prev != chip_num); - } else { + if (chip) { if (!tpm_try_get_ops(chip)) - res = chip; + return chip; + return NULL; } - mutex_unlock(&idr_lock); - - return res; + chip = tpm_default_chip(); + if (!chip) + return NULL; + rc = tpm_try_get_ops(chip); + /* release additional reference we got from tpm_default_chip() */ + put_device(&chip->dev); + if (!rc) + return NULL; + return chip; } /** -- 2.17.1