Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1521473 > unrolled thread
| Started by | Nayna Jain <nayna@linux.vnet.ibm.com> |
|---|---|
| First post | 2016-11-14 11:10 +0100 |
| Last post | 2016-11-21 19:30 +0100 |
| Articles | 20 on this page of 32 — 4 participants |
Back to article view | Back to linux.kernel
[PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
[PATCH v6 9/9] tpm: cleanup of printk error messages Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 9/9] tpm: cleanup of printk error messages Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:30 +0100
Re: [PATCH v6 9/9] tpm: cleanup of printk error messages Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:20 +0100
[PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:20 +0100
Re: [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:30 +0100
Re: [tpmdd-devel] [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:20 +0100
[PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-22 12:30 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-11-22 17:50 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Nayna <nayna@linux.vnet.ibm.com> - 2016-11-24 04:20 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-24 13:00 +0100
Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-24 13:00 +0100
[PATCH v6 5/9] tpm: have event log use the tpm_chip Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 5/9] tpm: have event log use the tpm_chip Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 00:50 +0100
Re: [PATCH v6 5/9] tpm: have event log use the tpm_chip Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:20 +0100
[PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:30 +0100
Re: [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:20 +0100
[PATCH v6 1/9] tpm: define a generic open() method for ascii & bios measurements Nayna Jain <nayna@linux.vnet.ibm.com> - 2016-11-14 11:10 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-14 23:40 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:30 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 01:40 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 03:20 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Nayna <nayna@linux.vnet.ibm.com> - 2016-11-15 06:40 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 18:50 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-11-15 19:10 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-15 20:00 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-11-19 19:40 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-11-20 11:00 +0100
Re: [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-11-21 19:30 +0100
Page 1 of 2 [1] 2 Next page →
| From | Nayna Jain <nayna@linux.vnet.ibm.com> |
|---|---|
| Date | 2016-11-14 11:10 +0100 |
| Subject | [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support |
| Message-ID | <sDmn7-5BA-3@gated-at.bofh.it> |
This patch set includes the cleanup and bug fixes patches, previously
part of the "tpm: add the securityfs pseudo files support for TPM 2.0
firmware event log" patch set, in order to upstream them more quickly.
Changelog History:
v6:
- Patch "tpm: replace symbolic permission with octal for securityfs files"
- New Patch.
- Patch "tpm: have event log use the tpm_chip"
- Changed commit description as per Jason's suggestion.
- Fixed bug related to kfree() for bios_event_log.
- Moved inode_unlock() just after get_device() in open().
- Returned -ENODEV for read_log() ENOMEM error and other errors as it is.
- Added comment in tpm_bios_log_teardown() to explain inode_lock()/unlock
reasoning.
- Splitted .owner into different patch.
- Patch "tpm: fix the missing .owner in tpm_bios_measurements_ops"
- New Patch.
- Patch "tpm: cleanup of printk error messages"
- Replaced dev_info() with dev_warn().
- Updated commit description subject line.
v5:
- Moved cleanup/fixes patches into this patch set.
- Patch "fix the race condition between event log access and chip
getting unregistered"
- updated subject line and commit description.
- modified fops code to use chip kref.
- modified fops to lock inode before accessing inode private data.
- renamed tpm_securityfs_data to tpm_chip_seqops, as it no more
holds bios log, but associates seqops with respective chip. For
the same reason, moved it to tpm.h
- Patch "replace or remove printk error messages"
- cleaned up dev_dbg and used dev_info as applicable.
v4:
- Includes feedbacks from Jarkko and Jason.
- Patch "tpm: define a generic open() method for ascii & bios
measurements".
- Fix indentation issue.
- Patch "tpm: replace the dynamically allocated bios_dir as
struct dentry array".
- Continue to use bios_dir_count variable to use is_bad() checks and
to maintain correct order for securityfs_remove() during teardown.
- Reset chip->bios_dir_count in teardown() function.
- Patch "tpm: validate the event log access before tpm_bios_log_setup".
- Retain TPM2 check which was removed in previous patch.
- Add tpm_bios_log_setup failure handling.
- Remove use of private data from v3 version of patch. Add a new
member to struct tpm_chip to achieve the same purpose.
- Patch "tpm: redefine the read_log method to check for ACPI/OF
properties sequentially".
- Move replacement of CONFIG_TCG_IBMVTPM with CONFIG_OF to
this patch from patch 3.
- Replace -1 error code with -ENODEV.
- Patch "tpm: replace the of_find_node_by_name() with dev of_node
property".
- Uses chip->dev.parent->of_node.
- Created separate patch for cleanup of pr_err messages.
- Patch "tpm: remove printk error messages".
- New Patch.
- Patch "tpm: add the securityfs file support for TPM 2.0 event log".
- Parses event digests using event alg_id rather than event log header
alg_id.
- Uses of_property_match_string to differentiate tpm/vtpm compatible
property.
- Adds the comment for difference in tpm/vtpm endianness.
v3:
- Includes the review feedbacks as suggested by Jason.
- Split of patches into one patch per idea.
- Generic open() method for ascii/bios measurements.
- Replacement of of **bios_dir with *bios_dir[3].
- Verifying readlog() is successful before creating securityfs entries.
- Generic readlog() to check for ACPI/OF in sequence.
- read_log_of() method now uses of_node propertry rather than
calling find_device_by_name.
- read_log differentiates vtpm/tpm using its compatible property.
- Cleans pr_err with dev_dbg.
- Commit msgs subject line prefixed with tpm.
v2:
- Fixes issues as given in feedback by Jason.
- Adds documentation for device tree.
Nayna Jain (9):
tpm: define a generic open() method for ascii & bios measurements
tpm: replace symbolic permission with octal for securityfs files
tpm: replace dynamically allocated bios_dir with a static array
tpm: drop tpm1_chip_register(/unregister)
tpm: have event log use the tpm_chip
tpm: fix the missing .owner in tpm_bios_measurements_ops
tpm: redefine read_log() to handle ACPI/OF at runtime
tpm: replace of_find_node_by_name() with dev of_node property
tpm: cleanup of printk error messages
drivers/char/tpm/Makefile | 14 +--
drivers/char/tpm/tpm-chip.c | 33 ++----
drivers/char/tpm/tpm-sysfs.c | 3 +
drivers/char/tpm/tpm.h | 14 ++-
drivers/char/tpm/tpm_acpi.c | 38 +++----
drivers/char/tpm/tpm_eventlog.c | 222 +++++++++++++++++++++-------------------
drivers/char/tpm/tpm_eventlog.h | 22 ++--
drivers/char/tpm/tpm_of.c | 45 +++-----
8 files changed, 187 insertions(+), 204 deletions(-)
--
2.5.0
[toc] | [next] | [standalone]
| From | Nayna Jain <nayna@linux.vnet.ibm.com> |
|---|---|
| Date | 2016-11-14 11:10 +0100 |
| Subject | [PATCH v6 9/9] tpm: cleanup of printk error messages |
| Message-ID | <sDmn8-5BA-23@gated-at.bofh.it> |
| In reply to | #1521473 |
This patch removes the unnecessary error messages on failing to
allocate memory and replaces pr_err/printk with dev_dbg/dev_info
as applicable.
Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
---
drivers/char/tpm/tpm_acpi.c | 16 ++++------------
drivers/char/tpm/tpm_of.c | 29 +++++++++--------------------
2 files changed, 13 insertions(+), 32 deletions(-)
diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index fa30c969..ddbaef2 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -60,11 +60,8 @@ int read_log_acpi(struct tpm_chip *chip)
status = acpi_get_table(ACPI_SIG_TCPA, 1,
(struct acpi_table_header **)&buff);
- if (ACPI_FAILURE(status)) {
- printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n",
- __func__);
+ if (ACPI_FAILURE(status))
return -EIO;
- }
switch(buff->platform_class) {
case BIOS_SERVER:
@@ -78,25 +75,20 @@ int read_log_acpi(struct tpm_chip *chip)
break;
}
if (!len) {
- printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__);
+ dev_warn(&chip->dev, "%s: TCPA log area empty\n", __func__);
return -EIO;
}
/* malloc EventLog space */
log->bios_event_log = kmalloc(len, GFP_KERNEL);
- if (!log->bios_event_log) {
- printk("%s: ERROR - Not enough Memory for BIOS measurements\n",
- __func__);
+ if (!log->bios_event_log)
return -ENOMEM;
- }
log->bios_event_log_end = log->bios_event_log + len;
virt = acpi_os_map_iomem(start, len);
- if (!virt) {
- printk("%s: ERROR - Unable to map memory\n", __func__);
+ if (!virt)
goto err;
- }
memcpy_fromio(log->bios_event_log, virt, len);
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index 22b8f81..3af829f 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -31,40 +31,29 @@ int read_log_of(struct tpm_chip *chip)
log = &chip->log;
if (chip->dev.parent->of_node)
np = chip->dev.parent->of_node;
- if (!np) {
- pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
+ if (!np)
return -ENODEV;
- }
sizep = of_get_property(np, "linux,sml-size", NULL);
- if (sizep == NULL) {
- pr_err("%s: ERROR - SML size not found\n", __func__);
- goto cleanup_eio;
- }
+ if (sizep == NULL)
+ return -EIO;
+
if (*sizep == 0) {
- pr_err("%s: ERROR - event log area empty\n", __func__);
- goto cleanup_eio;
+ dev_warn(&chip->dev, "%s: Event log area empty\n", __func__);
+ return -EIO;
}
basep = of_get_property(np, "linux,sml-base", NULL);
- if (basep == NULL) {
- pr_err("%s: ERROR - SML not found\n", __func__);
- goto cleanup_eio;
- }
+ if (basep == NULL)
+ return -EIO;
log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);
- if (!log->bios_event_log) {
- pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",
- __func__);
+ if (!log->bios_event_log)
return -ENOMEM;
- }
log->bios_event_log_end = log->bios_event_log + *sizep;
memcpy(log->bios_event_log, __va(*basep), *sizep);
return 0;
-
-cleanup_eio:
- return -EIO;
}
--
2.5.0
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-14 23:30 +0100 |
| Subject | Re: [PATCH v6 9/9] tpm: cleanup of printk error messages |
| Message-ID | <sDxVf-4Bm-7@gated-at.bofh.it> |
| In reply to | #1521474 |
On Mon, Nov 14, 2016 at 05:00:56AM -0500, Nayna Jain wrote:
> This patch removes the unnecessary error messages on failing to
> allocate memory and replaces pr_err/printk with dev_dbg/dev_info
> as applicable.
>
> Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
> ---
> drivers/char/tpm/tpm_acpi.c | 16 ++++------------
> drivers/char/tpm/tpm_of.c | 29 +++++++++--------------------
> 2 files changed, 13 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
> index fa30c969..ddbaef2 100644
> --- a/drivers/char/tpm/tpm_acpi.c
> +++ b/drivers/char/tpm/tpm_acpi.c
> @@ -60,11 +60,8 @@ int read_log_acpi(struct tpm_chip *chip)
> status = acpi_get_table(ACPI_SIG_TCPA, 1,
> (struct acpi_table_header **)&buff);
>
> - if (ACPI_FAILURE(status)) {
> - printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n",
> - __func__);
> + if (ACPI_FAILURE(status))
> return -EIO;
> - }
>
> switch(buff->platform_class) {
> case BIOS_SERVER:
> @@ -78,25 +75,20 @@ int read_log_acpi(struct tpm_chip *chip)
> break;
> }
> if (!len) {
> - printk(KERN_ERR "%s: ERROR - TCPA log area empty\n", __func__);
> + dev_warn(&chip->dev, "%s: TCPA log area empty\n", __func__);
> return -EIO;
> }
>
> /* malloc EventLog space */
> log->bios_event_log = kmalloc(len, GFP_KERNEL);
> - if (!log->bios_event_log) {
> - printk("%s: ERROR - Not enough Memory for BIOS measurements\n",
> - __func__);
> + if (!log->bios_event_log)
> return -ENOMEM;
> - }
>
> log->bios_event_log_end = log->bios_event_log + len;
>
> virt = acpi_os_map_iomem(start, len);
> - if (!virt) {
> - printk("%s: ERROR - Unable to map memory\n", __func__);
> + if (!virt)
> goto err;
> - }
>
> memcpy_fromio(log->bios_event_log, virt, len);
>
> diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
> index 22b8f81..3af829f 100644
> --- a/drivers/char/tpm/tpm_of.c
> +++ b/drivers/char/tpm/tpm_of.c
> @@ -31,40 +31,29 @@ int read_log_of(struct tpm_chip *chip)
> log = &chip->log;
> if (chip->dev.parent->of_node)
> np = chip->dev.parent->of_node;
> - if (!np) {
> - pr_err("%s: ERROR - IBMVTPM not supported\n", __func__);
> + if (!np)
> return -ENODEV;
> - }
>
> sizep = of_get_property(np, "linux,sml-size", NULL);
> - if (sizep == NULL) {
> - pr_err("%s: ERROR - SML size not found\n", __func__);
> - goto cleanup_eio;
> - }
> + if (sizep == NULL)
> + return -EIO;
> +
> if (*sizep == 0) {
> - pr_err("%s: ERROR - event log area empty\n", __func__);
> - goto cleanup_eio;
> + dev_warn(&chip->dev, "%s: Event log area empty\n", __func__);
> + return -EIO;
> }
>
> basep = of_get_property(np, "linux,sml-base", NULL);
> - if (basep == NULL) {
> - pr_err("%s: ERROR - SML not found\n", __func__);
> - goto cleanup_eio;
> - }
> + if (basep == NULL)
> + return -EIO;
>
> log->bios_event_log = kmalloc(*sizep, GFP_KERNEL);
> - if (!log->bios_event_log) {
> - pr_err("%s: ERROR - Not enough memory for BIOS measurements\n",
> - __func__);
> + if (!log->bios_event_log)
> return -ENOMEM;
> - }
>
> log->bios_event_log_end = log->bios_event_log + *sizep;
>
> memcpy(log->bios_event_log, __va(*basep), *sizep);
>
> return 0;
> -
> -cleanup_eio:
> - return -EIO;
> }
> --
> 2.5.0
>
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-15 01:20 +0100 |
| Subject | Re: [PATCH v6 9/9] tpm: cleanup of printk error messages |
| Message-ID | <sDzDH-5Uj-5@gated-at.bofh.it> |
| In reply to | #1522132 |
On Mon, Nov 14, 2016 at 02:24:06PM -0800, Jarkko Sakkinen wrote: > On Mon, Nov 14, 2016 at 05:00:56AM -0500, Nayna Jain wrote: > > This patch removes the unnecessary error messages on failing to > > allocate memory and replaces pr_err/printk with dev_dbg/dev_info > > as applicable. > > > > Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > > Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com> > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko
[toc] | [prev] | [next] | [standalone]
| From | Nayna Jain <nayna@linux.vnet.ibm.com> |
|---|---|
| Date | 2016-11-14 11:10 +0100 |
| Subject | [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files |
| Message-ID | <sDmn8-5BA-29@gated-at.bofh.it> |
| In reply to | #1521473 |
checkpatch.pl flags warning for symbolic permissions and suggests
to replace with octal value.
This patch changes securityfs pseudo files permission
to octal values in tpm_bios_log_setup().
Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
---
drivers/char/tpm/tpm_eventlog.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index 42b49c4..9467e31 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -378,7 +378,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
bin_file =
securityfs_create_file("binary_bios_measurements",
- S_IRUSR | S_IRGRP, tpm_dir,
+ 0440, tpm_dir,
(void *)&tpm_binary_b_measurements_seqops,
&tpm_bios_measurements_ops);
if (is_bad(bin_file))
@@ -386,7 +386,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
ascii_file =
securityfs_create_file("ascii_bios_measurements",
- S_IRUSR | S_IRGRP, tpm_dir,
+ 0440, tpm_dir,
(void *)&tpm_ascii_b_measurements_seqops,
&tpm_bios_measurements_ops);
if (is_bad(ascii_file))
--
2.5.0
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-14 23:20 +0100 |
| Subject | Re: [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files |
| Message-ID | <sDxLz-4xB-17@gated-at.bofh.it> |
| In reply to | #1521475 |
On Mon, Nov 14, 2016 at 05:00:49AM -0500, Nayna Jain wrote:
> checkpatch.pl flags warning for symbolic permissions and suggests
> to replace with octal value.
>
> This patch changes securityfs pseudo files permission
> to octal values in tpm_bios_log_setup().
>
> Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
> ---
> drivers/char/tpm/tpm_eventlog.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
> index 42b49c4..9467e31 100644
> --- a/drivers/char/tpm/tpm_eventlog.c
> +++ b/drivers/char/tpm/tpm_eventlog.c
> @@ -378,7 +378,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
>
> bin_file =
> securityfs_create_file("binary_bios_measurements",
> - S_IRUSR | S_IRGRP, tpm_dir,
> + 0440, tpm_dir,
> (void *)&tpm_binary_b_measurements_seqops,
> &tpm_bios_measurements_ops);
> if (is_bad(bin_file))
> @@ -386,7 +386,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
>
> ascii_file =
> securityfs_create_file("ascii_bios_measurements",
> - S_IRUSR | S_IRGRP, tpm_dir,
> + 0440, tpm_dir,
> (void *)&tpm_ascii_b_measurements_seqops,
> &tpm_bios_measurements_ops);
> if (is_bad(ascii_file))
> --
> 2.5.0
>
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-14 23:30 +0100 |
| Subject | Re: [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files |
| Message-ID | <sDxVg-4Bm-47@gated-at.bofh.it> |
| In reply to | #1521475 |
On Mon, Nov 14, 2016 at 05:00:49AM -0500, Nayna Jain wrote:
> checkpatch.pl flags warning for symbolic permissions and suggests
> to replace with octal value.
>
> This patch changes securityfs pseudo files permission
> to octal values in tpm_bios_log_setup().
>
> Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
> ---
> drivers/char/tpm/tpm_eventlog.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
> index 42b49c4..9467e31 100644
> --- a/drivers/char/tpm/tpm_eventlog.c
> +++ b/drivers/char/tpm/tpm_eventlog.c
> @@ -378,7 +378,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
>
> bin_file =
> securityfs_create_file("binary_bios_measurements",
> - S_IRUSR | S_IRGRP, tpm_dir,
> + 0440, tpm_dir,
> (void *)&tpm_binary_b_measurements_seqops,
> &tpm_bios_measurements_ops);
> if (is_bad(bin_file))
> @@ -386,7 +386,7 @@ struct dentry **tpm_bios_log_setup(const char *name)
>
> ascii_file =
> securityfs_create_file("ascii_bios_measurements",
> - S_IRUSR | S_IRGRP, tpm_dir,
> + 0440, tpm_dir,
> (void *)&tpm_ascii_b_measurements_seqops,
> &tpm_bios_measurements_ops);
> if (is_bad(ascii_file))
> --
> 2.5.0
>
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-15 01:20 +0100 |
| Subject | Re: [tpmdd-devel] [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files |
| Message-ID | <sDzDH-5Uj-9@gated-at.bofh.it> |
| In reply to | #1522145 |
On Mon, Nov 14, 2016 at 02:21:14PM -0800, Jarkko Sakkinen wrote: > On Mon, Nov 14, 2016 at 05:00:49AM -0500, Nayna Jain wrote: > > checkpatch.pl flags warning for symbolic permissions and suggests > > to replace with octal value. > > > > This patch changes securityfs pseudo files permission > > to octal values in tpm_bios_log_setup(). > > > > Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com> > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko
[toc] | [prev] | [next] | [standalone]
| From | Nayna Jain <nayna@linux.vnet.ibm.com> |
|---|---|
| Date | 2016-11-14 11:10 +0100 |
| Subject | [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) |
| Message-ID | <sDmn8-5BA-13@gated-at.bofh.it> |
| In reply to | #1521473 |
Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and
tpm_bios_log_teardown in order to make code flow cleaner and to enable
to implement TPM 2.0 support later on. This is partially derived from
the commit by Nayna Jain with the extension that also tpm1_chip_register
is dropped.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
drivers/char/tpm/tpm-chip.c | 31 +++++--------------------------
drivers/char/tpm/tpm-sysfs.c | 3 +++
drivers/char/tpm/tpm_eventlog.c | 3 +++
3 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index d0c1872..250a651 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -276,28 +276,6 @@ static void tpm_del_char_device(struct tpm_chip *chip)
up_write(&chip->ops_sem);
}
-static int tpm1_chip_register(struct tpm_chip *chip)
-{
- int rc;
-
- if (chip->flags & TPM_CHIP_FLAG_TPM2)
- return 0;
-
- tpm_sysfs_add_device(chip);
-
- rc = tpm_bios_log_setup(chip);
-
- return rc;
-}
-
-static void tpm1_chip_unregister(struct tpm_chip *chip)
-{
- if (chip->flags & TPM_CHIP_FLAG_TPM2)
- return;
-
- tpm_bios_log_teardown(chip);
-}
-
static void tpm_del_legacy_sysfs(struct tpm_chip *chip)
{
struct attribute **i;
@@ -364,7 +342,9 @@ int tpm_chip_register(struct tpm_chip *chip)
return rc;
}
- rc = tpm1_chip_register(chip);
+ tpm_sysfs_add_device(chip);
+
+ rc = tpm_bios_log_setup(chip);
if (rc)
return rc;
@@ -372,7 +352,7 @@ int tpm_chip_register(struct tpm_chip *chip)
rc = tpm_add_char_device(chip);
if (rc) {
- tpm1_chip_unregister(chip);
+ tpm_bios_log_teardown(chip);
return rc;
}
@@ -402,8 +382,7 @@ EXPORT_SYMBOL_GPL(tpm_chip_register);
void tpm_chip_unregister(struct tpm_chip *chip)
{
tpm_del_legacy_sysfs(chip);
-
- tpm1_chip_unregister(chip);
+ tpm_bios_log_teardown(chip);
tpm_del_char_device(chip);
}
EXPORT_SYMBOL_GPL(tpm_chip_unregister);
diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
index 59a1ead..848ad65 100644
--- a/drivers/char/tpm/tpm-sysfs.c
+++ b/drivers/char/tpm/tpm-sysfs.c
@@ -284,6 +284,9 @@ static const struct attribute_group tpm_dev_group = {
void tpm_sysfs_add_device(struct tpm_chip *chip)
{
+ if (chip->flags & TPM_CHIP_FLAG_TPM2)
+ return;
+
/* The sysfs routines rely on an implicit tpm_try_get_ops, device_del
* is called before ops is null'd and the sysfs core synchronizes this
* removal so that no callbacks are running or can run again
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index 62e9da6..57ac862 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -373,6 +373,9 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
const char *name = dev_name(&chip->dev);
unsigned int cnt;
+ if (chip->flags & TPM_CHIP_FLAG_TPM2)
+ return 0;
+
cnt = 0;
chip->bios_dir[cnt] = securityfs_create_dir(name, NULL);
if (is_bad(chip->bios_dir[cnt]))
--
2.5.0
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-22 12:30 +0100 |
| Subject | Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) |
| Message-ID | <sGhqV-6tz-9@gated-at.bofh.it> |
| In reply to | #1521476 |
On Mon, Nov 14, 2016 at 05:00:51AM -0500, Nayna Jain wrote:
> Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and
> tpm_bios_log_teardown in order to make code flow cleaner and to enable
> to implement TPM 2.0 support later on. This is partially derived from
> the commit by Nayna Jain with the extension that also tpm1_chip_register
> is dropped.
>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit remains unreviewed and tested. I'm in the author role here
so I cannot help with this. If that does not happen soon I cannot put
this into the pull request.
/Jarkko
> ---
> drivers/char/tpm/tpm-chip.c | 31 +++++--------------------------
> drivers/char/tpm/tpm-sysfs.c | 3 +++
> drivers/char/tpm/tpm_eventlog.c | 3 +++
> 3 files changed, 11 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index d0c1872..250a651 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -276,28 +276,6 @@ static void tpm_del_char_device(struct tpm_chip *chip)
> up_write(&chip->ops_sem);
> }
>
> -static int tpm1_chip_register(struct tpm_chip *chip)
> -{
> - int rc;
> -
> - if (chip->flags & TPM_CHIP_FLAG_TPM2)
> - return 0;
> -
> - tpm_sysfs_add_device(chip);
> -
> - rc = tpm_bios_log_setup(chip);
> -
> - return rc;
> -}
> -
> -static void tpm1_chip_unregister(struct tpm_chip *chip)
> -{
> - if (chip->flags & TPM_CHIP_FLAG_TPM2)
> - return;
> -
> - tpm_bios_log_teardown(chip);
> -}
> -
> static void tpm_del_legacy_sysfs(struct tpm_chip *chip)
> {
> struct attribute **i;
> @@ -364,7 +342,9 @@ int tpm_chip_register(struct tpm_chip *chip)
> return rc;
> }
>
> - rc = tpm1_chip_register(chip);
> + tpm_sysfs_add_device(chip);
> +
> + rc = tpm_bios_log_setup(chip);
> if (rc)
> return rc;
>
> @@ -372,7 +352,7 @@ int tpm_chip_register(struct tpm_chip *chip)
>
> rc = tpm_add_char_device(chip);
> if (rc) {
> - tpm1_chip_unregister(chip);
> + tpm_bios_log_teardown(chip);
> return rc;
> }
>
> @@ -402,8 +382,7 @@ EXPORT_SYMBOL_GPL(tpm_chip_register);
> void tpm_chip_unregister(struct tpm_chip *chip)
> {
> tpm_del_legacy_sysfs(chip);
> -
> - tpm1_chip_unregister(chip);
> + tpm_bios_log_teardown(chip);
> tpm_del_char_device(chip);
> }
> EXPORT_SYMBOL_GPL(tpm_chip_unregister);
> diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c
> index 59a1ead..848ad65 100644
> --- a/drivers/char/tpm/tpm-sysfs.c
> +++ b/drivers/char/tpm/tpm-sysfs.c
> @@ -284,6 +284,9 @@ static const struct attribute_group tpm_dev_group = {
>
> void tpm_sysfs_add_device(struct tpm_chip *chip)
> {
> + if (chip->flags & TPM_CHIP_FLAG_TPM2)
> + return;
> +
> /* The sysfs routines rely on an implicit tpm_try_get_ops, device_del
> * is called before ops is null'd and the sysfs core synchronizes this
> * removal so that no callbacks are running or can run again
> diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
> index 62e9da6..57ac862 100644
> --- a/drivers/char/tpm/tpm_eventlog.c
> +++ b/drivers/char/tpm/tpm_eventlog.c
> @@ -373,6 +373,9 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
> const char *name = dev_name(&chip->dev);
> unsigned int cnt;
>
> + if (chip->flags & TPM_CHIP_FLAG_TPM2)
> + return 0;
> +
> cnt = 0;
> chip->bios_dir[cnt] = securityfs_create_dir(name, NULL);
> if (is_bad(chip->bios_dir[cnt]))
> --
> 2.5.0
>
[toc] | [prev] | [next] | [standalone]
| From | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> |
|---|---|
| Date | 2016-11-22 17:50 +0100 |
| Subject | Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) |
| Message-ID | <sGmqC-1ia-25@gated-at.bofh.it> |
| In reply to | #1527430 |
On Tue, Nov 22, 2016 at 01:22:00PM +0200, Jarkko Sakkinen wrote: > On Mon, Nov 14, 2016 at 05:00:51AM -0500, Nayna Jain wrote: > > Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and > > tpm_bios_log_teardown in order to make code flow cleaner and to enable > > to implement TPM 2.0 support later on. This is partially derived from > > the commit by Nayna Jain with the extension that also tpm1_chip_register > > is dropped. > > > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > This commit remains unreviewed and tested. I'm in the author role here > so I cannot help with this. If that does not happen soon I cannot put > this into the pull request. I tested it on my ARM system when I tested your branch. I think it looks better this way.. Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Jason
[toc] | [prev] | [next] | [standalone]
| From | Nayna <nayna@linux.vnet.ibm.com> |
|---|---|
| Date | 2016-11-24 04:20 +0100 |
| Subject | Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) |
| Message-ID | <sGSJP-5i6-7@gated-at.bofh.it> |
| In reply to | #1527692 |
On 11/22/2016 10:12 PM, Jason Gunthorpe wrote: > On Tue, Nov 22, 2016 at 01:22:00PM +0200, Jarkko Sakkinen wrote: >> On Mon, Nov 14, 2016 at 05:00:51AM -0500, Nayna Jain wrote: >>> Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and >>> tpm_bios_log_teardown in order to make code flow cleaner and to enable >>> to implement TPM 2.0 support later on. This is partially derived from >>> the commit by Nayna Jain with the extension that also tpm1_chip_register >>> is dropped. >>> >>> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> >> >> This commit remains unreviewed and tested. I'm in the author role here >> so I cannot help with this. If that does not happen soon I cannot put >> this into the pull request. > > I tested it on my ARM system when I tested your branch. > > I think it looks better this way.. > > Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > > Jason > From my side also, as part of testing the whole patchset, I have tested this patch. Tested-by: Nayna Jain <nayna@linux.vnet.ibm.com> Reviewed-by: Nayna Jain <nayna@linux.vnet.ibm.com> Thanks & Regards, - Nayna
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-24 13:00 +0100 |
| Subject | Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) |
| Message-ID | <sH0R3-27o-13@gated-at.bofh.it> |
| In reply to | #1528939 |
On Thu, Nov 24, 2016 at 12:03:39AM +0530, Nayna wrote: > > > On 11/22/2016 10:12 PM, Jason Gunthorpe wrote: > > On Tue, Nov 22, 2016 at 01:22:00PM +0200, Jarkko Sakkinen wrote: > > > On Mon, Nov 14, 2016 at 05:00:51AM -0500, Nayna Jain wrote: > > > > Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and > > > > tpm_bios_log_teardown in order to make code flow cleaner and to enable > > > > to implement TPM 2.0 support later on. This is partially derived from > > > > the commit by Nayna Jain with the extension that also tpm1_chip_register > > > > is dropped. > > > > > > > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > > > > > This commit remains unreviewed and tested. I'm in the author role here > > > so I cannot help with this. If that does not happen soon I cannot put > > > this into the pull request. > > > > I tested it on my ARM system when I tested your branch. > > > > I think it looks better this way.. > > > > Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > > > > Jason > > > > From my side also, as part of testing the whole patchset, I have tested this > patch. > > Tested-by: Nayna Jain <nayna@linux.vnet.ibm.com> > Reviewed-by: Nayna Jain <nayna@linux.vnet.ibm.com> > > Thanks & Regards, > - Nayna Thanks Nayna! I'll go on creating pull request... /Jarkko
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-24 13:00 +0100 |
| Subject | Re: [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) |
| Message-ID | <sH0R3-27o-15@gated-at.bofh.it> |
| In reply to | #1527692 |
On Tue, Nov 22, 2016 at 09:42:40AM -0700, Jason Gunthorpe wrote: > On Tue, Nov 22, 2016 at 01:22:00PM +0200, Jarkko Sakkinen wrote: > > On Mon, Nov 14, 2016 at 05:00:51AM -0500, Nayna Jain wrote: > > > Check for TPM2 chip in tpm_sysfs_add_device, tpm_bios_log_setup and > > > tpm_bios_log_teardown in order to make code flow cleaner and to enable > > > to implement TPM 2.0 support later on. This is partially derived from > > > the commit by Nayna Jain with the extension that also tpm1_chip_register > > > is dropped. > > > > > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > > > This commit remains unreviewed and tested. I'm in the author role here > > so I cannot help with this. If that does not happen soon I cannot put > > this into the pull request. > > I tested it on my ARM system when I tested your branch. > > I think it looks better this way.. > > Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Thanks. I'll also add tested-by from you then. /Jarkko
[toc] | [prev] | [next] | [standalone]
| From | Nayna Jain <nayna@linux.vnet.ibm.com> |
|---|---|
| Date | 2016-11-14 11:10 +0100 |
| Subject | [PATCH v6 5/9] tpm: have event log use the tpm_chip |
| Message-ID | <sDmn8-5BA-33@gated-at.bofh.it> |
| In reply to | #1521473 |
Move the backing memory for the event log into tpm_chip and push
the tpm_chip into read_log. This optimizes read_log processing by
only doing it once and prepares things for the next patches in the
series which require the tpm_chip to locate the event log via
ACPI and OF handles instead of searching.
This is straightfoward except for the issue of passing a kref through
i_private with securityfs. Since securityfs_remove does not have any
removal fencing like sysfs we use the inode lock to safely get a
kref on the tpm_chip.
Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
---
drivers/char/tpm/tpm-chip.c | 3 +-
drivers/char/tpm/tpm.h | 11 ++++++
drivers/char/tpm/tpm_acpi.c | 15 +++++--
drivers/char/tpm/tpm_eventlog.c | 88 ++++++++++++++++++++++++++---------------
drivers/char/tpm/tpm_eventlog.h | 2 +-
drivers/char/tpm/tpm_of.c | 4 +-
6 files changed, 85 insertions(+), 38 deletions(-)
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index 250a651..3f27753 100644
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -127,6 +127,7 @@ static void tpm_dev_release(struct device *dev)
idr_remove(&dev_nums_idr, chip->dev_num);
mutex_unlock(&idr_lock);
+ kfree(chip->log.bios_event_log);
kfree(chip);
}
@@ -345,7 +346,7 @@ int tpm_chip_register(struct tpm_chip *chip)
tpm_sysfs_add_device(chip);
rc = tpm_bios_log_setup(chip);
- if (rc)
+ if (rc == -ENODEV)
return rc;
tpm_add_ppi(chip);
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 9d69580..1ae9768 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -35,6 +35,8 @@
#include <linux/cdev.h>
#include <linux/highmem.h>
+#include "tpm_eventlog.h"
+
enum tpm_const {
TPM_MINOR = 224, /* officially assigned */
TPM_BUFSIZE = 4096,
@@ -146,6 +148,11 @@ enum tpm_chip_flags {
TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4),
};
+struct tpm_chip_seqops {
+ struct tpm_chip *chip;
+ const struct seq_operations *seqops;
+};
+
struct tpm_chip {
struct device dev;
struct cdev cdev;
@@ -157,6 +164,10 @@ struct tpm_chip {
struct rw_semaphore ops_sem;
const struct tpm_class_ops *ops;
+ struct tpm_bios_log log;
+ struct tpm_chip_seqops bin_log_seqops;
+ struct tpm_chip_seqops ascii_log_seqops;
+
unsigned int flags;
int dev_num; /* /dev/tpm# */
diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
index 565a947..01dfb35 100644
--- a/drivers/char/tpm/tpm_acpi.c
+++ b/drivers/char/tpm/tpm_acpi.c
@@ -9,7 +9,7 @@
*
* Maintained by: <tpmdd-devel@lists.sourceforge.net>
*
- * Access to the eventlog extended by the TCG BIOS of PC platform
+ * Access to the event log extended by the TCG BIOS of PC platform
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -45,13 +45,15 @@ struct acpi_tcpa {
};
/* read binary bios log */
-int read_log(struct tpm_bios_log *log)
+int read_log(struct tpm_chip *chip)
{
struct acpi_tcpa *buff;
acpi_status status;
void __iomem *virt;
u64 len, start;
+ struct tpm_bios_log *log;
+ log = &chip->log;
if (log->bios_event_log != NULL) {
printk(KERN_ERR
"%s: ERROR - Eventlog already initialized\n",
@@ -97,13 +99,18 @@ int read_log(struct tpm_bios_log *log)
virt = acpi_os_map_iomem(start, len);
if (!virt) {
- kfree(log->bios_event_log);
printk("%s: ERROR - Unable to map memory\n", __func__);
- return -EIO;
+ goto err;
}
memcpy_fromio(log->bios_event_log, virt, len);
acpi_os_unmap_iomem(virt, len);
return 0;
+
+err:
+ kfree(log->bios_event_log);
+ log->bios_event_log = NULL;
+ return -EIO;
+
}
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index 57ac862..f8c42fe 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -11,7 +11,7 @@
*
* Maintained by: <tpmdd-devel@lists.sourceforge.net>
*
- * Access to the eventlog created by a system's firmware / BIOS
+ * Access to the event log created by a system's firmware / BIOS
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -73,7 +73,8 @@ static const char* tcpa_pc_event_id_strings[] = {
static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
{
loff_t i;
- struct tpm_bios_log *log = m->private;
+ struct tpm_chip *chip = m->private;
+ struct tpm_bios_log *log = &chip->log;
void *addr = log->bios_event_log;
void *limit = log->bios_event_log_end;
struct tcpa_event *event;
@@ -120,7 +121,8 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
loff_t *pos)
{
struct tcpa_event *event = v;
- struct tpm_bios_log *log = m->private;
+ struct tpm_chip *chip = m->private;
+ struct tpm_bios_log *log = &chip->log;
void *limit = log->bios_event_log_end;
u32 converted_event_size;
u32 converted_event_type;
@@ -261,13 +263,10 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
static int tpm_bios_measurements_release(struct inode *inode,
struct file *file)
{
- struct seq_file *seq = file->private_data;
- struct tpm_bios_log *log = seq->private;
+ struct seq_file *seq = (struct seq_file *)file->private_data;
+ struct tpm_chip *chip = (struct tpm_chip *)seq->private;
- if (log) {
- kfree(log->bios_event_log);
- kfree(log);
- }
+ put_device(&chip->dev);
return seq_release(inode, file);
}
@@ -323,33 +322,30 @@ static int tpm_bios_measurements_open(struct inode *inode,
struct file *file)
{
int err;
- struct tpm_bios_log *log;
struct seq_file *seq;
- const struct seq_operations *seqops =
- (const struct seq_operations *)inode->i_private;
-
- log = kzalloc(sizeof(struct tpm_bios_log), GFP_KERNEL);
- if (!log)
- return -ENOMEM;
-
- if ((err = read_log(log)))
- goto out_free;
+ struct tpm_chip_seqops *chip_seqops;
+ const struct seq_operations *seqops;
+ struct tpm_chip *chip;
+
+ inode_lock(inode);
+ if (!inode->i_private) {
+ inode_unlock(inode);
+ return -ENODEV;
+ }
+ chip_seqops = (struct tpm_chip_seqops *)inode->i_private;
+ seqops = chip_seqops->seqops;
+ chip = chip_seqops->chip;
+ get_device(&chip->dev);
+ inode_unlock(inode);
/* now register seq file */
err = seq_open(file, seqops);
if (!err) {
seq = file->private_data;
- seq->private = log;
- } else {
- goto out_free;
+ seq->private = chip;
}
-out:
return err;
-out_free:
- kfree(log->bios_event_log);
- kfree(log);
- goto out;
}
static const struct file_operations tpm_bios_measurements_ops = {
@@ -372,29 +368,47 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
{
const char *name = dev_name(&chip->dev);
unsigned int cnt;
+ int rc = 0;
if (chip->flags & TPM_CHIP_FLAG_TPM2)
return 0;
+ rc = read_log(chip);
+ /*
+ * read_log failure means event log is not supported except for ENOMEM.
+ */
+ if (rc < 0) {
+ if (rc == -ENOMEM)
+ return -ENODEV;
+ else
+ return rc;
+ }
+
cnt = 0;
chip->bios_dir[cnt] = securityfs_create_dir(name, NULL);
if (is_bad(chip->bios_dir[cnt]))
goto err;
cnt++;
+ chip->bin_log_seqops.chip = chip;
+ chip->bin_log_seqops.seqops = &tpm_binary_b_measurements_seqops;
+
chip->bios_dir[cnt] =
securityfs_create_file("binary_bios_measurements",
0440, chip->bios_dir[0],
- (void *)&tpm_binary_b_measurements_seqops,
+ (void *)&chip->bin_log_seqops,
&tpm_bios_measurements_ops);
if (is_bad(chip->bios_dir[cnt]))
goto err;
cnt++;
+ chip->ascii_log_seqops.chip = chip;
+ chip->ascii_log_seqops.seqops = &tpm_ascii_b_measurements_seqops;
+
chip->bios_dir[cnt] =
securityfs_create_file("ascii_bios_measurements",
0440, chip->bios_dir[0],
- (void *)&tpm_ascii_b_measurements_seqops,
+ (void *)&chip->ascii_log_seqops,
&tpm_bios_measurements_ops);
if (is_bad(chip->bios_dir[cnt]))
goto err;
@@ -411,7 +425,19 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
void tpm_bios_log_teardown(struct tpm_chip *chip)
{
int i;
-
- for (i = (TPM_NUM_EVENT_LOG_FILES - 1); i >= 0; i--)
+ struct inode *inode;
+
+ /* securityfs_remove currently doesn't take care of handling sync
+ * between removal and opening of pseudo files. To handle this, a
+ * workaround is added by making i_private = NULL here during removal
+ * and to check it during open(), both within inode_lock()/unlock().
+ * This design ensures that open() either safely gets kref or fails.
+ */
+ for (i = (TPM_NUM_EVENT_LOG_FILES - 1); i >= 0; i--) {
+ inode = d_inode(chip->bios_dir[i]);
+ inode_lock(inode);
+ inode->i_private = NULL;
+ inode_unlock(inode);
securityfs_remove(chip->bios_dir[i]);
+ }
}
diff --git a/drivers/char/tpm/tpm_eventlog.h b/drivers/char/tpm/tpm_eventlog.h
index fd3357e..6df2f8e 100644
--- a/drivers/char/tpm/tpm_eventlog.h
+++ b/drivers/char/tpm/tpm_eventlog.h
@@ -73,7 +73,7 @@ enum tcpa_pc_event_ids {
HOST_TABLE_OF_DEVICES,
};
-int read_log(struct tpm_bios_log *log);
+int read_log(struct tpm_chip *chip);
#if defined(CONFIG_TCG_IBMVTPM) || defined(CONFIG_TCG_IBMVTPM_MODULE) || \
defined(CONFIG_ACPI)
diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
index 570f30c..68d891a 100644
--- a/drivers/char/tpm/tpm_of.c
+++ b/drivers/char/tpm/tpm_of.c
@@ -20,12 +20,14 @@
#include "tpm.h"
#include "tpm_eventlog.h"
-int read_log(struct tpm_bios_log *log)
+int read_log(struct tpm_chip *chip)
{
struct device_node *np;
const u32 *sizep;
const u64 *basep;
+ struct tpm_bios_log *log;
+ log = &chip->log;
if (log->bios_event_log != NULL) {
pr_err("%s: ERROR - Eventlog already initialized\n", __func__);
return -EFAULT;
--
2.5.0
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-15 00:50 +0100 |
| Subject | Re: [PATCH v6 5/9] tpm: have event log use the tpm_chip |
| Message-ID | <sDzaF-5oL-1@gated-at.bofh.it> |
| In reply to | #1521477 |
On Mon, Nov 14, 2016 at 05:00:52AM -0500, Nayna Jain wrote:
> Move the backing memory for the event log into tpm_chip and push
> the tpm_chip into read_log. This optimizes read_log processing by
> only doing it once and prepares things for the next patches in the
> series which require the tpm_chip to locate the event log via
> ACPI and OF handles instead of searching.
>
> This is straightfoward except for the issue of passing a kref through
> i_private with securityfs. Since securityfs_remove does not have any
> removal fencing like sysfs we use the inode lock to safely get a
> kref on the tpm_chip.
>
> Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
> ---
> drivers/char/tpm/tpm-chip.c | 3 +-
> drivers/char/tpm/tpm.h | 11 ++++++
> drivers/char/tpm/tpm_acpi.c | 15 +++++--
> drivers/char/tpm/tpm_eventlog.c | 88 ++++++++++++++++++++++++++---------------
> drivers/char/tpm/tpm_eventlog.h | 2 +-
> drivers/char/tpm/tpm_of.c | 4 +-
> 6 files changed, 85 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 250a651..3f27753 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -127,6 +127,7 @@ static void tpm_dev_release(struct device *dev)
> idr_remove(&dev_nums_idr, chip->dev_num);
> mutex_unlock(&idr_lock);
>
> + kfree(chip->log.bios_event_log);
> kfree(chip);
> }
>
> @@ -345,7 +346,7 @@ int tpm_chip_register(struct tpm_chip *chip)
> tpm_sysfs_add_device(chip);
>
> rc = tpm_bios_log_setup(chip);
> - if (rc)
> + if (rc == -ENODEV)
> return rc;
>
> tpm_add_ppi(chip);
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index 9d69580..1ae9768 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -35,6 +35,8 @@
> #include <linux/cdev.h>
> #include <linux/highmem.h>
>
> +#include "tpm_eventlog.h"
> +
> enum tpm_const {
> TPM_MINOR = 224, /* officially assigned */
> TPM_BUFSIZE = 4096,
> @@ -146,6 +148,11 @@ enum tpm_chip_flags {
> TPM_CHIP_FLAG_HAVE_TIMEOUTS = BIT(4),
> };
>
> +struct tpm_chip_seqops {
> + struct tpm_chip *chip;
> + const struct seq_operations *seqops;
> +};
> +
> struct tpm_chip {
> struct device dev;
> struct cdev cdev;
> @@ -157,6 +164,10 @@ struct tpm_chip {
> struct rw_semaphore ops_sem;
> const struct tpm_class_ops *ops;
>
> + struct tpm_bios_log log;
> + struct tpm_chip_seqops bin_log_seqops;
> + struct tpm_chip_seqops ascii_log_seqops;
> +
> unsigned int flags;
>
> int dev_num; /* /dev/tpm# */
> diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
> index 565a947..01dfb35 100644
> --- a/drivers/char/tpm/tpm_acpi.c
> +++ b/drivers/char/tpm/tpm_acpi.c
> @@ -9,7 +9,7 @@
> *
> * Maintained by: <tpmdd-devel@lists.sourceforge.net>
> *
> - * Access to the eventlog extended by the TCG BIOS of PC platform
> + * Access to the event log extended by the TCG BIOS of PC platform
> *
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License
> @@ -45,13 +45,15 @@ struct acpi_tcpa {
> };
>
> /* read binary bios log */
> -int read_log(struct tpm_bios_log *log)
> +int read_log(struct tpm_chip *chip)
> {
> struct acpi_tcpa *buff;
> acpi_status status;
> void __iomem *virt;
> u64 len, start;
> + struct tpm_bios_log *log;
>
> + log = &chip->log;
> if (log->bios_event_log != NULL) {
> printk(KERN_ERR
> "%s: ERROR - Eventlog already initialized\n",
> @@ -97,13 +99,18 @@ int read_log(struct tpm_bios_log *log)
>
> virt = acpi_os_map_iomem(start, len);
> if (!virt) {
> - kfree(log->bios_event_log);
> printk("%s: ERROR - Unable to map memory\n", __func__);
> - return -EIO;
> + goto err;
> }
>
> memcpy_fromio(log->bios_event_log, virt, len);
>
> acpi_os_unmap_iomem(virt, len);
> return 0;
> +
> +err:
> + kfree(log->bios_event_log);
> + log->bios_event_log = NULL;
> + return -EIO;
> +
> }
> diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
> index 57ac862..f8c42fe 100644
> --- a/drivers/char/tpm/tpm_eventlog.c
> +++ b/drivers/char/tpm/tpm_eventlog.c
> @@ -11,7 +11,7 @@
> *
> * Maintained by: <tpmdd-devel@lists.sourceforge.net>
> *
> - * Access to the eventlog created by a system's firmware / BIOS
> + * Access to the event log created by a system's firmware / BIOS
> *
> * This program is free software; you can redistribute it and/or
> * modify it under the terms of the GNU General Public License
> @@ -73,7 +73,8 @@ static const char* tcpa_pc_event_id_strings[] = {
> static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
> {
> loff_t i;
> - struct tpm_bios_log *log = m->private;
> + struct tpm_chip *chip = m->private;
> + struct tpm_bios_log *log = &chip->log;
> void *addr = log->bios_event_log;
> void *limit = log->bios_event_log_end;
> struct tcpa_event *event;
> @@ -120,7 +121,8 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
> loff_t *pos)
> {
> struct tcpa_event *event = v;
> - struct tpm_bios_log *log = m->private;
> + struct tpm_chip *chip = m->private;
> + struct tpm_bios_log *log = &chip->log;
> void *limit = log->bios_event_log_end;
> u32 converted_event_size;
> u32 converted_event_type;
> @@ -261,13 +263,10 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
> static int tpm_bios_measurements_release(struct inode *inode,
> struct file *file)
> {
> - struct seq_file *seq = file->private_data;
> - struct tpm_bios_log *log = seq->private;
> + struct seq_file *seq = (struct seq_file *)file->private_data;
> + struct tpm_chip *chip = (struct tpm_chip *)seq->private;
>
> - if (log) {
> - kfree(log->bios_event_log);
> - kfree(log);
> - }
> + put_device(&chip->dev);
>
> return seq_release(inode, file);
> }
> @@ -323,33 +322,30 @@ static int tpm_bios_measurements_open(struct inode *inode,
> struct file *file)
> {
> int err;
> - struct tpm_bios_log *log;
> struct seq_file *seq;
> - const struct seq_operations *seqops =
> - (const struct seq_operations *)inode->i_private;
> -
> - log = kzalloc(sizeof(struct tpm_bios_log), GFP_KERNEL);
> - if (!log)
> - return -ENOMEM;
> -
> - if ((err = read_log(log)))
> - goto out_free;
> + struct tpm_chip_seqops *chip_seqops;
> + const struct seq_operations *seqops;
> + struct tpm_chip *chip;
> +
> + inode_lock(inode);
> + if (!inode->i_private) {
> + inode_unlock(inode);
> + return -ENODEV;
> + }
> + chip_seqops = (struct tpm_chip_seqops *)inode->i_private;
> + seqops = chip_seqops->seqops;
> + chip = chip_seqops->chip;
> + get_device(&chip->dev);
> + inode_unlock(inode);
>
> /* now register seq file */
> err = seq_open(file, seqops);
> if (!err) {
> seq = file->private_data;
> - seq->private = log;
> - } else {
> - goto out_free;
> + seq->private = chip;
> }
>
> -out:
> return err;
> -out_free:
> - kfree(log->bios_event_log);
> - kfree(log);
> - goto out;
> }
>
> static const struct file_operations tpm_bios_measurements_ops = {
> @@ -372,29 +368,47 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
> {
> const char *name = dev_name(&chip->dev);
> unsigned int cnt;
> + int rc = 0;
>
> if (chip->flags & TPM_CHIP_FLAG_TPM2)
> return 0;
>
> + rc = read_log(chip);
> + /*
> + * read_log failure means event log is not supported except for ENOMEM.
> + */
> + if (rc < 0) {
> + if (rc == -ENOMEM)
> + return -ENODEV;
> + else
> + return rc;
> + }
> +
> cnt = 0;
> chip->bios_dir[cnt] = securityfs_create_dir(name, NULL);
> if (is_bad(chip->bios_dir[cnt]))
> goto err;
> cnt++;
>
> + chip->bin_log_seqops.chip = chip;
> + chip->bin_log_seqops.seqops = &tpm_binary_b_measurements_seqops;
> +
> chip->bios_dir[cnt] =
> securityfs_create_file("binary_bios_measurements",
> 0440, chip->bios_dir[0],
> - (void *)&tpm_binary_b_measurements_seqops,
> + (void *)&chip->bin_log_seqops,
> &tpm_bios_measurements_ops);
> if (is_bad(chip->bios_dir[cnt]))
> goto err;
> cnt++;
>
> + chip->ascii_log_seqops.chip = chip;
> + chip->ascii_log_seqops.seqops = &tpm_ascii_b_measurements_seqops;
> +
> chip->bios_dir[cnt] =
> securityfs_create_file("ascii_bios_measurements",
> 0440, chip->bios_dir[0],
> - (void *)&tpm_ascii_b_measurements_seqops,
> + (void *)&chip->ascii_log_seqops,
> &tpm_bios_measurements_ops);
> if (is_bad(chip->bios_dir[cnt]))
> goto err;
> @@ -411,7 +425,19 @@ int tpm_bios_log_setup(struct tpm_chip *chip)
> void tpm_bios_log_teardown(struct tpm_chip *chip)
> {
> int i;
> -
> - for (i = (TPM_NUM_EVENT_LOG_FILES - 1); i >= 0; i--)
> + struct inode *inode;
> +
> + /* securityfs_remove currently doesn't take care of handling sync
> + * between removal and opening of pseudo files. To handle this, a
> + * workaround is added by making i_private = NULL here during removal
> + * and to check it during open(), both within inode_lock()/unlock().
> + * This design ensures that open() either safely gets kref or fails.
> + */
> + for (i = (TPM_NUM_EVENT_LOG_FILES - 1); i >= 0; i--) {
> + inode = d_inode(chip->bios_dir[i]);
> + inode_lock(inode);
> + inode->i_private = NULL;
> + inode_unlock(inode);
> securityfs_remove(chip->bios_dir[i]);
> + }
> }
> diff --git a/drivers/char/tpm/tpm_eventlog.h b/drivers/char/tpm/tpm_eventlog.h
> index fd3357e..6df2f8e 100644
> --- a/drivers/char/tpm/tpm_eventlog.h
> +++ b/drivers/char/tpm/tpm_eventlog.h
> @@ -73,7 +73,7 @@ enum tcpa_pc_event_ids {
> HOST_TABLE_OF_DEVICES,
> };
>
> -int read_log(struct tpm_bios_log *log);
> +int read_log(struct tpm_chip *chip);
>
> #if defined(CONFIG_TCG_IBMVTPM) || defined(CONFIG_TCG_IBMVTPM_MODULE) || \
> defined(CONFIG_ACPI)
> diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c
> index 570f30c..68d891a 100644
> --- a/drivers/char/tpm/tpm_of.c
> +++ b/drivers/char/tpm/tpm_of.c
> @@ -20,12 +20,14 @@
> #include "tpm.h"
> #include "tpm_eventlog.h"
>
> -int read_log(struct tpm_bios_log *log)
> +int read_log(struct tpm_chip *chip)
> {
> struct device_node *np;
> const u32 *sizep;
> const u64 *basep;
> + struct tpm_bios_log *log;
>
> + log = &chip->log;
> if (log->bios_event_log != NULL) {
> pr_err("%s: ERROR - Eventlog already initialized\n", __func__);
> return -EFAULT;
> --
> 2.5.0
>
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-15 01:20 +0100 |
| Subject | Re: [PATCH v6 5/9] tpm: have event log use the tpm_chip |
| Message-ID | <sDzDH-5Uj-15@gated-at.bofh.it> |
| In reply to | #1522189 |
On Mon, Nov 14, 2016 at 03:44:01PM -0800, Jarkko Sakkinen wrote: > On Mon, Nov 14, 2016 at 05:00:52AM -0500, Nayna Jain wrote: > > Move the backing memory for the event log into tpm_chip and push > > the tpm_chip into read_log. This optimizes read_log processing by > > only doing it once and prepares things for the next patches in the > > series which require the tpm_chip to locate the event log via > > ACPI and OF handles instead of searching. > > > > This is straightfoward except for the issue of passing a kref through > > i_private with securityfs. Since securityfs_remove does not have any > > removal fencing like sysfs we use the inode lock to safely get a > > kref on the tpm_chip. > > > > Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > > Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com> > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko
[toc] | [prev] | [next] | [standalone]
| From | Nayna Jain <nayna@linux.vnet.ibm.com> |
|---|---|
| Date | 2016-11-14 11:10 +0100 |
| Subject | [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops |
| Message-ID | <sDmn8-5BA-39@gated-at.bofh.it> |
| In reply to | #1521473 |
This patch fixes the missing .owner field in
tpm_bios_measurements_ops definition.
Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
---
drivers/char/tpm/tpm_eventlog.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
index f8c42fe..5575ffc 100644
--- a/drivers/char/tpm/tpm_eventlog.c
+++ b/drivers/char/tpm/tpm_eventlog.c
@@ -349,6 +349,7 @@ static int tpm_bios_measurements_open(struct inode *inode,
}
static const struct file_operations tpm_bios_measurements_ops = {
+ .owner = THIS_MODULE,
.open = tpm_bios_measurements_open,
.read = seq_read,
.llseek = seq_lseek,
--
2.5.0
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-14 23:30 +0100 |
| Subject | Re: [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops |
| Message-ID | <sDxVg-4Bm-51@gated-at.bofh.it> |
| In reply to | #1521479 |
On Mon, Nov 14, 2016 at 05:00:53AM -0500, Nayna Jain wrote:
> This patch fixes the missing .owner field in
> tpm_bios_measurements_ops definition.
>
> Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
> ---
> drivers/char/tpm/tpm_eventlog.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
> index f8c42fe..5575ffc 100644
> --- a/drivers/char/tpm/tpm_eventlog.c
> +++ b/drivers/char/tpm/tpm_eventlog.c
> @@ -349,6 +349,7 @@ static int tpm_bios_measurements_open(struct inode *inode,
> }
>
> static const struct file_operations tpm_bios_measurements_ops = {
> + .owner = THIS_MODULE,
> .open = tpm_bios_measurements_open,
> .read = seq_read,
> .llseek = seq_lseek,
> --
> 2.5.0
>
[toc] | [prev] | [next] | [standalone]
| From | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
|---|---|
| Date | 2016-11-15 01:20 +0100 |
| Subject | Re: [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops |
| Message-ID | <sDzDH-5Uj-3@gated-at.bofh.it> |
| In reply to | #1522148 |
On Mon, Nov 14, 2016 at 02:22:09PM -0800, Jarkko Sakkinen wrote: > On Mon, Nov 14, 2016 at 05:00:53AM -0500, Nayna Jain wrote: > > This patch fixes the missing .owner field in > > tpm_bios_measurements_ops definition. > > > > Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > > Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com> > > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko
[toc] | [prev] | [next] | [standalone]
Page 1 of 2 [1] 2 Next page →
Back to top | Article view | linux.kernel
csiph-web