From: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Cc: Nayna Jain <nayna@linux.vnet.ibm.com>, tpmdd-devel@lists.sourceforge.net, peterhuewe@gmx.de, tpmdd@selhorst.net, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: Re: [PATCH v6 3/9] tpm: replace dynamically allocated bios_dir with a static array Date: Tue, 22 Nov 2016 09:58:56 -0700 [thread overview] Message-ID: <20161122165856.GD3956@obsidianresearch.com> (raw) In-Reply-To: <20161122112333.7ootyrbssd6pkrjb@intel.com> On Tue, Nov 22, 2016 at 01:23:33PM +0200, Jarkko Sakkinen wrote: > On Mon, Nov 14, 2016 at 05:00:50AM -0500, Nayna Jain wrote: > > This commit is based on a commit by Nayna Jain. Replaced dynamically > > allocated bios_dir with a static array as the size is always constant. > > > > Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> > > Signed-off-by: Nayna Jain <nayna@linux.vnet.ibm.com> > > 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. Nayna must have tested it, looks OK to me.. > > +err: > > + chip->bios_dir[cnt] = NULL; > > + tpm_bios_log_teardown(chip); > > + return -EIO; Except that return should ideally be PTR_ERR(chip->bios_dir[cnt]) .. and we still set ERR_PTR into bios_dir in the ENODEV case, so the overall series is still broken if securityfs is compiled out. Lets fix this all like this - which is a good enough reason to leave the ENODEV detect alone - just squash this into your patch: diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c index 2a15b866ac257a..11bb1138a8282e 100644 --- a/drivers/char/tpm/tpm_eventlog.c +++ b/drivers/char/tpm/tpm_eventlog.c @@ -356,15 +356,6 @@ static const struct file_operations tpm_bios_measurements_ops = { .release = tpm_bios_measurements_release, }; -static int is_bad(void *p) -{ - if (!p) - return 1; - if (IS_ERR(p) && (PTR_ERR(p) != -ENODEV)) - return 1; - return 0; -} - static int tpm_read_log(struct tpm_chip *chip) { int rc; @@ -390,7 +381,8 @@ static int tpm_read_log(struct tpm_chip *chip) * If an event log is found then the securityfs files are setup to * export it to userspace, otherwise nothing is done. * - * Returns -ENODEV if the firmware has no event log. + * Returns -ENODEV if the firmware has no event log or securityfs is not + * supported. */ int tpm_bios_log_setup(struct tpm_chip *chip) { @@ -407,7 +399,10 @@ int tpm_bios_log_setup(struct tpm_chip *chip) cnt = 0; chip->bios_dir[cnt] = securityfs_create_dir(name, NULL); - if (is_bad(chip->bios_dir[cnt])) + /* NOTE: securityfs_create_dir can return ENODEV if securityfs is + * compiled out. The caller should ignore the ENODEV return code. + */ + if (IS_ERR(chip->bios_dir[cnt])) goto err; cnt++; @@ -419,7 +414,7 @@ int tpm_bios_log_setup(struct tpm_chip *chip) 0440, chip->bios_dir[0], (void *)&chip->bin_log_seqops, &tpm_bios_measurements_ops); - if (is_bad(chip->bios_dir[cnt])) + if (IS_ERR(chip->bios_dir[cnt])) goto err; cnt++; @@ -431,16 +426,17 @@ int tpm_bios_log_setup(struct tpm_chip *chip) 0440, chip->bios_dir[0], (void *)&chip->ascii_log_seqops, &tpm_bios_measurements_ops); - if (is_bad(chip->bios_dir[cnt])) + if (IS_ERR(chip->bios_dir[cnt])) goto err; cnt++; return 0; err: + rc = PTR_ERR(chip->bios_dir[cnt]); chip->bios_dir[cnt] = NULL; tpm_bios_log_teardown(chip); - return -EIO; + return rc; } void tpm_bios_log_teardown(struct tpm_chip *chip)
WARNING: multiple messages have this Message-ID (diff)
From: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> To: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Subject: Re: [PATCH v6 3/9] tpm: replace dynamically allocated bios_dir with a static array Date: Tue, 22 Nov 2016 09:58:56 -0700 [thread overview] Message-ID: <20161122165856.GD3956@obsidianresearch.com> (raw) In-Reply-To: <20161122112333.7ootyrbssd6pkrjb-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> On Tue, Nov 22, 2016 at 01:23:33PM +0200, Jarkko Sakkinen wrote: > On Mon, Nov 14, 2016 at 05:00:50AM -0500, Nayna Jain wrote: > > This commit is based on a commit by Nayna Jain. Replaced dynamically > > allocated bios_dir with a static array as the size is always constant. > > > > Suggested-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org> > > Signed-off-by: Nayna Jain <nayna-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org> > > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > > 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. Nayna must have tested it, looks OK to me.. > > +err: > > + chip->bios_dir[cnt] = NULL; > > + tpm_bios_log_teardown(chip); > > + return -EIO; Except that return should ideally be PTR_ERR(chip->bios_dir[cnt]) .. and we still set ERR_PTR into bios_dir in the ENODEV case, so the overall series is still broken if securityfs is compiled out. Lets fix this all like this - which is a good enough reason to leave the ENODEV detect alone - just squash this into your patch: diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c index 2a15b866ac257a..11bb1138a8282e 100644 --- a/drivers/char/tpm/tpm_eventlog.c +++ b/drivers/char/tpm/tpm_eventlog.c @@ -356,15 +356,6 @@ static const struct file_operations tpm_bios_measurements_ops = { .release = tpm_bios_measurements_release, }; -static int is_bad(void *p) -{ - if (!p) - return 1; - if (IS_ERR(p) && (PTR_ERR(p) != -ENODEV)) - return 1; - return 0; -} - static int tpm_read_log(struct tpm_chip *chip) { int rc; @@ -390,7 +381,8 @@ static int tpm_read_log(struct tpm_chip *chip) * If an event log is found then the securityfs files are setup to * export it to userspace, otherwise nothing is done. * - * Returns -ENODEV if the firmware has no event log. + * Returns -ENODEV if the firmware has no event log or securityfs is not + * supported. */ int tpm_bios_log_setup(struct tpm_chip *chip) { @@ -407,7 +399,10 @@ int tpm_bios_log_setup(struct tpm_chip *chip) cnt = 0; chip->bios_dir[cnt] = securityfs_create_dir(name, NULL); - if (is_bad(chip->bios_dir[cnt])) + /* NOTE: securityfs_create_dir can return ENODEV if securityfs is + * compiled out. The caller should ignore the ENODEV return code. + */ + if (IS_ERR(chip->bios_dir[cnt])) goto err; cnt++; @@ -419,7 +414,7 @@ int tpm_bios_log_setup(struct tpm_chip *chip) 0440, chip->bios_dir[0], (void *)&chip->bin_log_seqops, &tpm_bios_measurements_ops); - if (is_bad(chip->bios_dir[cnt])) + if (IS_ERR(chip->bios_dir[cnt])) goto err; cnt++; @@ -431,16 +426,17 @@ int tpm_bios_log_setup(struct tpm_chip *chip) 0440, chip->bios_dir[0], (void *)&chip->ascii_log_seqops, &tpm_bios_measurements_ops); - if (is_bad(chip->bios_dir[cnt])) + if (IS_ERR(chip->bios_dir[cnt])) goto err; cnt++; return 0; err: + rc = PTR_ERR(chip->bios_dir[cnt]); chip->bios_dir[cnt] = NULL; tpm_bios_log_teardown(chip); - return -EIO; + return rc; } void tpm_bios_log_teardown(struct tpm_chip *chip) ------------------------------------------------------------------------------
next prev parent reply other threads:[~2016-11-22 16:59 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-14 10:00 [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Nayna Jain 2016-11-14 10:00 ` [PATCH v6 1/9] tpm: define a generic open() method for ascii & bios measurements Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 10:00 ` [PATCH v6 2/9] tpm: replace symbolic permission with octal for securityfs files Nayna Jain 2016-11-14 22:18 ` Jarkko Sakkinen 2016-11-14 22:18 ` Jarkko Sakkinen 2016-11-14 22:21 ` Jarkko Sakkinen 2016-11-14 22:21 ` Jarkko Sakkinen 2016-11-15 0:11 ` [tpmdd-devel] " Jarkko Sakkinen 2016-11-15 0:11 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 3/9] tpm: replace dynamically allocated bios_dir with a static array Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-22 11:23 ` Jarkko Sakkinen 2016-11-22 16:58 ` Jason Gunthorpe [this message] 2016-11-22 16:58 ` Jason Gunthorpe 2016-11-24 13:57 ` Jarkko Sakkinen 2016-11-24 13:57 ` Jarkko Sakkinen 2016-11-24 16:53 ` Jason Gunthorpe 2016-11-24 16:53 ` Jason Gunthorpe 2016-11-25 8:08 ` Jarkko Sakkinen 2016-11-25 8:08 ` Jarkko Sakkinen 2016-11-25 19:38 ` Jason Gunthorpe 2016-11-26 12:54 ` Jarkko Sakkinen 2016-11-22 19:26 ` Nayna 2016-11-24 14:01 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 4/9] tpm: drop tpm1_chip_register(/unregister) Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-22 11:22 ` Jarkko Sakkinen 2016-11-22 16:42 ` Jason Gunthorpe 2016-11-22 16:42 ` Jason Gunthorpe 2016-11-23 18:33 ` Nayna 2016-11-23 18:33 ` Nayna 2016-11-24 11:52 ` Jarkko Sakkinen 2016-11-24 11:51 ` Jarkko Sakkinen 2016-11-24 11:51 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 5/9] tpm: have event log use the tpm_chip Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 23:44 ` Jarkko Sakkinen 2016-11-15 0:12 ` Jarkko Sakkinen 2016-11-15 0:12 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 6/9] tpm: fix the missing .owner in tpm_bios_measurements_ops Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 22:22 ` Jarkko Sakkinen 2016-11-15 0:13 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 7/9] tpm: redefine read_log() to handle ACPI/OF at runtime Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-15 0:14 ` Jarkko Sakkinen 2016-11-14 10:00 ` [PATCH v6 8/9] tpm: replace of_find_node_by_name() with dev of_node property Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 10:00 ` [PATCH v6 9/9] tpm: cleanup of printk error messages Nayna Jain 2016-11-14 10:00 ` Nayna Jain 2016-11-14 22:24 ` Jarkko Sakkinen 2016-11-14 22:24 ` Jarkko Sakkinen 2016-11-15 0:15 ` Jarkko Sakkinen 2016-11-14 22:33 ` [PATCH v6 0/9] tpm: cleanup/fixes in existing event log support Jarkko Sakkinen 2016-11-14 22:33 ` Jarkko Sakkinen 2016-11-15 0:25 ` Jarkko Sakkinen 2016-11-15 0:30 ` Jarkko Sakkinen 2016-11-15 0:30 ` Jarkko Sakkinen 2016-11-15 2:15 ` Jarkko Sakkinen 2016-11-15 5:35 ` Nayna 2016-11-15 5:35 ` Nayna 2016-11-15 17:40 ` Jarkko Sakkinen 2016-11-15 18:06 ` Jason Gunthorpe 2016-11-15 18:54 ` Jarkko Sakkinen 2016-11-19 18:36 ` Jason Gunthorpe 2016-11-19 18:36 ` Jason Gunthorpe 2016-11-20 9:58 ` Jarkko Sakkinen 2016-11-21 18:25 ` Jason Gunthorpe
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=20161122165856.GD3956@obsidianresearch.com \ --to=jgunthorpe@obsidianresearch.com \ --cc=jarkko.sakkinen@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=nayna@linux.vnet.ibm.com \ --cc=peterhuewe@gmx.de \ --cc=tpmdd-devel@lists.sourceforge.net \ --cc=tpmdd@selhorst.net \ /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.