From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> To: Ed Swierk <eswierk@skyportsystems.com> Cc: tpmdd-devel@lists.sourceforge.net, stefanb@us.ibm.com, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, jgunthorpe@obsidianresearch.com Subject: Re: [PATCH v6 3/5] tpm: Factor out reading of timeout and duration capabilities Date: Sun, 19 Jun 2016 14:12:14 +0200 [thread overview] Message-ID: <20160619120157.GA29626@intel.com> (raw) In-Reply-To: <1465610107-87762-4-git-send-email-eswierk@skyportsystems.com> On Fri, Jun 10, 2016 at 06:55:05PM -0700, Ed Swierk wrote: > Factor sending the TPM_GetCapability command and validating the result > from tpm_get_timeouts() into a new function. Return all errors to the > caller rather than swallowing them (e.g. when tpm_transmit_cmd() > returns nonzero). > > Signed-off-by: Ed Swierk <eswierk@skyportsystems.com> > --- > drivers/char/tpm/tpm-interface.c | 96 ++++++++++++++++++++++------------------ > 1 file changed, 52 insertions(+), 44 deletions(-) I'm sorry but just now that I started applying these patches this patch started to bother me. > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index cc1e5bc..4d1f62c 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -502,6 +502,52 @@ static int tpm_startup(struct tpm_chip *chip, __be16 startup_type) > "attempting to start the TPM"); > } > > +static int tpm_get_cap_prop(struct tpm_chip *chip, __be32 type, int size, > + cap_t *cap, char *desc) > +{ > + struct tpm_cmd_t tpm_cmd; > + ssize_t rc; > + > + tpm_cmd.header.in = tpm_getcap_header; > + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; > + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); > + tpm_cmd.params.getcap_in.subcap = type; > + rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, NULL); > + > + if (rc == TPM_ERR_INVALID_POSTINIT) { > + /* The TPM is not started, we are the first to talk to it. > + Execute a startup command. */ > + dev_info(chip->pdev, "Issuing TPM_STARTUP\n"); > + if (tpm_startup(chip, TPM_ST_CLEAR)) > + return rc; > + > + tpm_cmd.header.in = tpm_getcap_header; > + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; > + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); > + tpm_cmd.params.getcap_in.subcap = type; > + rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, > + NULL); > + } I think inside tpm_get_timeouts() I'd rather something along the lines (with error handling and such details taken away): rc = tpm_getcap(...); if (rc == TPM_ERR_INVALID_POSTINIT) { tpm_startup(...); tpm_getca(...); } > + if (rc) { > + dev_err(chip->pdev, > + "Error %zd reading %s\n", rc, desc); > + return rc; > + } > + > + if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 || > + be32_to_cpu(tpm_cmd.header.out.length) > + != sizeof(tpm_cmd.header.out) + sizeof(u32) + size * sizeof(u32)) { > + dev_err(chip->pdev, > + "Bad return code or length reading %s\n", desc); > + return -EINVAL; > + } This is bogus code. All this kind of checks should be contained in tpm_transmit_cmd(). This is easily "fixed" by moving tpm_getcap() :) /Jarkko
WARNING: multiple messages have this Message-ID (diff)
From: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> To: Ed Swierk <eswierk-FilZDy9cOaHkQYj/0HfcvtBPR1lH4CV8@public.gmane.org> Cc: linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: Re: [PATCH v6 3/5] tpm: Factor out reading of timeout and duration capabilities Date: Sun, 19 Jun 2016 14:12:14 +0200 [thread overview] Message-ID: <20160619120157.GA29626@intel.com> (raw) In-Reply-To: <1465610107-87762-4-git-send-email-eswierk-FilZDy9cOaHkQYj/0HfcvtBPR1lH4CV8@public.gmane.org> On Fri, Jun 10, 2016 at 06:55:05PM -0700, Ed Swierk wrote: > Factor sending the TPM_GetCapability command and validating the result > from tpm_get_timeouts() into a new function. Return all errors to the > caller rather than swallowing them (e.g. when tpm_transmit_cmd() > returns nonzero). > > Signed-off-by: Ed Swierk <eswierk-FilZDy9cOaHkQYj/0HfcvtBPR1lH4CV8@public.gmane.org> > --- > drivers/char/tpm/tpm-interface.c | 96 ++++++++++++++++++++++------------------ > 1 file changed, 52 insertions(+), 44 deletions(-) I'm sorry but just now that I started applying these patches this patch started to bother me. > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c > index cc1e5bc..4d1f62c 100644 > --- a/drivers/char/tpm/tpm-interface.c > +++ b/drivers/char/tpm/tpm-interface.c > @@ -502,6 +502,52 @@ static int tpm_startup(struct tpm_chip *chip, __be16 startup_type) > "attempting to start the TPM"); > } > > +static int tpm_get_cap_prop(struct tpm_chip *chip, __be32 type, int size, > + cap_t *cap, char *desc) > +{ > + struct tpm_cmd_t tpm_cmd; > + ssize_t rc; > + > + tpm_cmd.header.in = tpm_getcap_header; > + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; > + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); > + tpm_cmd.params.getcap_in.subcap = type; > + rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, NULL); > + > + if (rc == TPM_ERR_INVALID_POSTINIT) { > + /* The TPM is not started, we are the first to talk to it. > + Execute a startup command. */ > + dev_info(chip->pdev, "Issuing TPM_STARTUP\n"); > + if (tpm_startup(chip, TPM_ST_CLEAR)) > + return rc; > + > + tpm_cmd.header.in = tpm_getcap_header; > + tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP; > + tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4); > + tpm_cmd.params.getcap_in.subcap = type; > + rc = tpm_transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, > + NULL); > + } I think inside tpm_get_timeouts() I'd rather something along the lines (with error handling and such details taken away): rc = tpm_getcap(...); if (rc == TPM_ERR_INVALID_POSTINIT) { tpm_startup(...); tpm_getca(...); } > + if (rc) { > + dev_err(chip->pdev, > + "Error %zd reading %s\n", rc, desc); > + return rc; > + } > + > + if (be32_to_cpu(tpm_cmd.header.out.return_code) != 0 || > + be32_to_cpu(tpm_cmd.header.out.length) > + != sizeof(tpm_cmd.header.out) + sizeof(u32) + size * sizeof(u32)) { > + dev_err(chip->pdev, > + "Bad return code or length reading %s\n", desc); > + return -EINVAL; > + } This is bogus code. All this kind of checks should be contained in tpm_transmit_cmd(). This is easily "fixed" by moving tpm_getcap() :) /Jarkko ------------------------------------------------------------------------------ What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic patterns at an interface-level. Reveals which users, apps, and protocols are consuming the most bandwidth. Provides multi-vendor support for NetFlow, J-Flow, sFlow and other flows. Make informed decisions using capacity planning reports. http://sdm.link/zohomanageengine
next prev parent reply other threads:[~2016-06-19 12:13 UTC|newest] Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-08 0:45 [PATCH v4 0/4] tpm: Command duration logging and chip-specific override Ed Swierk 2016-06-08 0:45 ` Ed Swierk 2016-06-08 0:45 ` [PATCH v4 1/4] tpm_tis: Improve reporting of IO errors Ed Swierk 2016-06-08 0:45 ` Ed Swierk 2016-06-08 0:45 ` [PATCH v4 2/4] tpm: Add optional logging of TPM command durations Ed Swierk 2016-06-08 0:45 ` Ed Swierk 2016-06-08 0:45 ` [PATCH v4 3/4] tpm: Allow TPM chip drivers to override reported " Ed Swierk 2016-06-08 0:45 ` Ed Swierk 2016-06-08 19:05 ` [tpmdd-devel] " Jason Gunthorpe 2016-06-08 19:05 ` Jason Gunthorpe 2016-06-08 20:41 ` [tpmdd-devel] " Ed Swierk 2016-06-08 0:45 ` [PATCH v4 4/4] tpm_tis: Increase ST19NP18 TPM command duration to avoid chip lockup Ed Swierk 2016-06-08 0:45 ` Ed Swierk 2016-06-08 23:00 ` [PATCH v5 0/4] tpm: Command duration logging and chip-specific override Ed Swierk 2016-06-08 23:00 ` Ed Swierk 2016-06-08 23:00 ` [PATCH v5 1/4] tpm_tis: Improve reporting of IO errors Ed Swierk 2016-06-08 23:00 ` Ed Swierk 2016-06-08 23:00 ` [PATCH v5 2/4] tpm: Add optional logging of TPM command durations Ed Swierk 2016-06-08 23:00 ` Ed Swierk 2016-06-08 23:00 ` [PATCH v5 3/4] tpm: Allow TPM chip drivers to override reported " Ed Swierk 2016-06-08 23:00 ` Ed Swierk 2016-06-10 12:19 ` Jarkko Sakkinen 2016-06-10 17:34 ` Ed Swierk 2016-06-10 19:42 ` Jarkko Sakkinen 2016-06-10 19:42 ` Jarkko Sakkinen 2016-06-11 1:54 ` Ed Swierk 2016-06-11 1:54 ` Ed Swierk 2016-06-08 23:00 ` [PATCH v5 4/4] tpm_tis: Increase ST19NP18 TPM command duration to avoid chip lockup Ed Swierk 2016-06-08 23:00 ` Ed Swierk 2016-06-11 1:55 ` [PATCH v6 0/5] tpm: Command duration logging and chip-specific override Ed Swierk 2016-06-11 1:55 ` Ed Swierk 2016-06-11 1:55 ` [PATCH v6 1/5] tpm_tis: Improve reporting of IO errors Ed Swierk 2016-06-11 1:55 ` Ed Swierk 2016-06-11 1:55 ` [PATCH v6 2/5] tpm: Add optional logging of TPM command durations Ed Swierk 2016-06-11 1:55 ` Ed Swierk 2016-06-11 1:55 ` [PATCH v6 3/5] tpm: Factor out reading of timeout and duration capabilities Ed Swierk 2016-06-11 1:55 ` Ed Swierk 2016-06-16 20:20 ` Jarkko Sakkinen 2016-06-16 20:20 ` Jarkko Sakkinen 2016-06-19 12:12 ` Jarkko Sakkinen [this message] 2016-06-19 12:12 ` Jarkko Sakkinen [not found] ` <20160619120157.GA29626-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> 2016-06-21 1:46 ` Ed Swierk 2016-06-11 1:55 ` [PATCH v6 4/5] tpm: Allow TPM chip drivers to override reported command durations Ed Swierk 2016-06-11 1:55 ` Ed Swierk 2016-06-16 20:26 ` Jarkko Sakkinen 2016-06-11 1:55 ` [PATCH v6 5/5] tpm_tis: Increase ST19NP18 TPM command duration to avoid chip lockup Ed Swierk 2016-06-11 1:55 ` Ed Swierk 2016-06-21 1:53 ` [PATCH v7 0/5] tpm: Command duration logging and chip-specific override Ed Swierk 2016-06-21 1:53 ` Ed Swierk 2016-06-21 1:53 ` [PATCH v7 1/5] tpm_tis: Improve reporting of IO errors Ed Swierk 2016-06-21 1:53 ` Ed Swierk 2016-06-21 1:53 ` [PATCH v7 2/5] tpm: Add optional logging of TPM command durations Ed Swierk 2016-06-21 1:53 ` Ed Swierk 2016-06-21 1:54 ` [PATCH v7 3/5] tpm: Clean up reading of timeout and duration capabilities Ed Swierk 2016-06-21 1:54 ` Ed Swierk 2016-06-21 20:52 ` Jarkko Sakkinen 2016-06-21 20:52 ` Jarkko Sakkinen 2016-06-22 0:21 ` Ed Swierk 2016-06-22 0:21 ` Ed Swierk 2016-06-22 10:46 ` Jarkko Sakkinen 2016-06-22 10:46 ` Jarkko Sakkinen 2016-06-21 1:54 ` [PATCH v7 4/5] tpm: Allow TPM chip drivers to override reported command durations Ed Swierk 2016-06-21 1:54 ` Ed Swierk 2016-06-21 20:54 ` Jarkko Sakkinen 2016-06-21 20:54 ` Jarkko Sakkinen 2016-06-21 1:54 ` [PATCH v7 5/5] tpm_tis: Increase ST19NP18 TPM command duration to avoid chip lockup Ed Swierk 2016-06-21 1:54 ` Ed Swierk 2016-06-21 20:55 ` Jarkko Sakkinen 2016-06-21 20:55 ` Jarkko Sakkinen 2016-06-22 1:10 ` [PATCH v8 0/5] tpm: Command duration logging and chip-specific override Ed Swierk 2016-06-22 1:10 ` Ed Swierk 2016-06-22 1:10 ` [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors Ed Swierk 2016-06-22 1:10 ` Ed Swierk 2016-06-24 18:25 ` Jason Gunthorpe 2016-06-24 18:25 ` Jason Gunthorpe 2016-06-24 20:21 ` Jarkko Sakkinen 2016-06-24 20:23 ` Jarkko Sakkinen 2016-06-24 20:26 ` Jason Gunthorpe 2016-06-24 20:26 ` Jason Gunthorpe 2016-06-25 15:24 ` Jarkko Sakkinen 2016-06-25 15:24 ` Jarkko Sakkinen 2016-06-25 15:47 ` Jarkko Sakkinen 2016-06-25 15:47 ` Jarkko Sakkinen 2016-06-27 17:55 ` Jason Gunthorpe 2016-06-27 17:55 ` Jason Gunthorpe 2016-06-22 1:10 ` [PATCH v8 2/5] tpm: Add optional logging of TPM command durations Ed Swierk 2016-06-22 1:10 ` Ed Swierk 2016-06-24 18:27 ` Jason Gunthorpe 2016-06-24 18:27 ` Jason Gunthorpe 2016-06-24 20:24 ` Jarkko Sakkinen 2016-06-24 20:24 ` Jarkko Sakkinen 2016-06-22 1:10 ` [PATCH v8 3/5] tpm: Clean up reading of timeout and duration capabilities Ed Swierk 2016-06-22 1:10 ` Ed Swierk 2016-06-22 1:10 ` [PATCH v8 4/5] tpm: Allow TPM chip drivers to override reported command durations Ed Swierk 2016-06-22 1:10 ` Ed Swierk 2016-06-22 1:10 ` [PATCH v8 5/5] tpm_tis: Increase ST19NP18 TPM command duration to avoid chip lockup Ed Swierk 2016-06-22 1:10 ` Ed Swierk 2016-07-13 16:19 ` [PATCH v9 0/5] tpm: Command duration logging and chip-specific override Ed Swierk 2016-07-13 16:19 ` [PATCH v9 1/5] tpm_tis: Improve reporting of IO errors Ed Swierk 2016-07-13 16:19 ` [PATCH v9 2/5] tpm: Add optional logging of TPM command durations Ed Swierk 2016-07-13 16:19 ` [PATCH v9 3/5] tpm: Clean up reading of timeout and duration capabilities Ed Swierk 2016-07-18 18:15 ` Jarkko Sakkinen 2016-07-18 18:19 ` Jarkko Sakkinen 2016-07-18 18:19 ` Jarkko Sakkinen 2016-07-18 18:20 ` Jarkko Sakkinen 2016-07-18 18:20 ` Jarkko Sakkinen 2016-07-13 16:19 ` [PATCH v9 4/5] tpm: Allow TPM chip drivers to override reported command durations Ed Swierk 2016-07-13 17:04 ` kbuild test robot 2016-07-13 17:04 ` kbuild test robot 2016-07-18 18:40 ` Jarkko Sakkinen 2016-07-18 18:40 ` Jarkko Sakkinen 2016-07-13 16:19 ` [PATCH v9 5/5] tpm_tis: Increase ST19NP18 TPM command duration to avoid chip lockup Ed Swierk 2016-07-13 16:44 ` [PATCH v9 0/5] tpm: Command duration logging and chip-specific override Ed Swierk 2016-07-13 17:36 ` Jason Gunthorpe 2016-07-13 17:36 ` Jason Gunthorpe 2016-07-13 20:00 ` Ed Swierk 2016-07-13 20:00 ` Ed Swierk 2016-07-13 20:58 ` Eric W. Biederman 2016-07-13 20:59 ` Jason Gunthorpe 2016-07-18 18:07 ` Jarkko Sakkinen 2016-07-18 18:07 ` 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=20160619120157.GA29626@intel.com \ --to=jarkko.sakkinen@linux.intel.com \ --cc=eswierk@skyportsystems.com \ --cc=jgunthorpe@obsidianresearch.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=stefanb@us.ibm.com \ --cc=tpmdd-devel@lists.sourceforge.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.