From: Stefan Berger <stefanb@linux.vnet.ibm.com> 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 <stefanb@linux.vnet.ibm.com> Subject: [PATCH v5 3/5] tpm: Convert tpm_find_get_ops() to use tpm_default_chip() Date: Tue, 26 Jun 2018 07:06:17 -0400 [thread overview] Message-ID: <20180626110619.2362791-4-stefanb@linux.vnet.ibm.com> (raw) In-Reply-To: <20180626110619.2362791-1-stefanb@linux.vnet.ibm.com> Convert tpm_find_get_ops() to use tpm_default_chip() in case no chip is passed in. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: stefanb@linux.vnet.ibm.com (Stefan Berger) To: linux-security-module@vger.kernel.org Subject: [PATCH v5 3/5] tpm: Convert tpm_find_get_ops() to use tpm_default_chip() Date: Tue, 26 Jun 2018 07:06:17 -0400 [thread overview] Message-ID: <20180626110619.2362791-4-stefanb@linux.vnet.ibm.com> (raw) In-Reply-To: <20180626110619.2362791-1-stefanb@linux.vnet.ibm.com> Convert tpm_find_get_ops() to use tpm_default_chip() in case no chip is passed in. Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-06-26 11:07 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-26 11:06 [PATCH v5 0/5] Have IMA find and use a tpm_chip until system shutdown Stefan Berger 2018-06-26 11:06 ` Stefan Berger 2018-06-26 11:06 ` [PATCH v5 1/5] tpm: rename tpm_chip_find_get() to tpm_find_get_ops() Stefan Berger 2018-06-26 11:06 ` Stefan Berger 2018-06-26 13:18 ` Jarkko Sakkinen 2018-06-26 13:18 ` Jarkko Sakkinen 2018-06-26 13:21 ` Jarkko Sakkinen 2018-06-26 13:21 ` Jarkko Sakkinen 2018-06-26 11:06 ` [PATCH v5 2/5] tpm: Implement tpm_default_chip() to find a TPM chip Stefan Berger 2018-06-26 11:06 ` Stefan Berger 2018-06-26 13:22 ` Jarkko Sakkinen 2018-06-26 13:22 ` Jarkko Sakkinen 2018-06-26 11:06 ` Stefan Berger [this message] 2018-06-26 11:06 ` [PATCH v5 3/5] tpm: Convert tpm_find_get_ops() to use tpm_default_chip() Stefan Berger 2018-06-26 13:24 ` Jarkko Sakkinen 2018-06-26 13:24 ` Jarkko Sakkinen 2018-06-26 11:06 ` [PATCH v5 4/5] ima: Use tpm_default_chip() and call TPM functions with a tpm_chip Stefan Berger 2018-06-26 11:06 ` Stefan Berger 2018-06-26 13:25 ` Jarkko Sakkinen 2018-06-26 13:25 ` Jarkko Sakkinen 2018-06-26 11:06 ` [PATCH v5 5/5] ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead Stefan Berger 2018-06-26 11:06 ` Stefan Berger 2018-06-26 13:26 ` Jarkko Sakkinen 2018-06-26 13:26 ` Jarkko Sakkinen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180626110619.2362791-4-stefanb@linux.vnet.ibm.com \ --to=stefanb@linux.vnet.ibm.com \ --cc=jarkko.sakkinen@linux.intel.com \ --cc=jgg@ziepe.ca \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=zohar@linux.vnet.ibm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.