* [PATCH] tpm: fix a sparse error in tpm-interface.c
@ 2017-01-31 18:07 Jarkko Sakkinen
2017-01-31 19:10 ` [tpmdd-devel] " James Bottomley
0 siblings, 1 reply; 3+ messages in thread
From: Jarkko Sakkinen @ 2017-01-31 18:07 UTC (permalink / raw)
To: tpmdd-devel
Cc: linux-security-module, Jarkko Sakkinen, Peter Huewe,
Marcel Selhorst, Jason Gunthorpe, open list
drivers/char/tpm//tpm-interface.c:492:42: warning: bad assignment (-=)
to restricted __be32
Fixes: 0883743825e3 ("TPM: sysfs functions consolidation")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
drivers/char/tpm/tpm-interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 423938e..746bc54 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -489,7 +489,7 @@ ssize_t tpm_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,
tpm_cmd.params.getcap_in.cap = cpu_to_be32(subcap_id);
/*subcap field not necessary */
tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(0);
- tpm_cmd.header.in.length -= cpu_to_be32(sizeof(__be32));
+ tpm_cmd.header.in.length = cpu_to_be32(18);
} else {
if (subcap_id == TPM_CAP_FLAG_PERM ||
subcap_id == TPM_CAP_FLAG_VOL)
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [tpmdd-devel] [PATCH] tpm: fix a sparse error in tpm-interface.c
2017-01-31 18:07 [PATCH] tpm: fix a sparse error in tpm-interface.c Jarkko Sakkinen
@ 2017-01-31 19:10 ` James Bottomley
2017-01-31 20:52 ` Jarkko Sakkinen
0 siblings, 1 reply; 3+ messages in thread
From: James Bottomley @ 2017-01-31 19:10 UTC (permalink / raw)
To: Jarkko Sakkinen, tpmdd-devel; +Cc: open list, linux-security-module
On Tue, 2017-01-31 at 20:07 +0200, Jarkko Sakkinen wrote:
> drivers/char/tpm//tpm-interface.c:492:42: warning: bad assignment (
> -=)
> to restricted __be32
>
> Fixes: 0883743825e3 ("TPM: sysfs functions consolidation")
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> ---
> drivers/char/tpm/tpm-interface.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm
> -interface.c
> index 423938e..746bc54 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -489,7 +489,7 @@ ssize_t tpm_getcap(struct tpm_chip *chip, u32
> subcap_id, cap_t *cap,
> tpm_cmd.params.getcap_in.cap =
> cpu_to_be32(subcap_id);
> /*subcap field not necessary */
> tpm_cmd.params.getcap_in.subcap_size =
> cpu_to_be32(0);
> - tpm_cmd.header.in.length -=
> cpu_to_be32(sizeof(__be32));
> + tpm_cmd.header.in.length = cpu_to_be32(18);
using bare numbers here without comment isn't really best practice.
What about setting header.in.length in both legs of the if() to either
tpm_cmd.header.in.length = cpu_to_be32(HEADER_SIZE + sizeof(struct tpm_getcap_params_in))
or
/* setting subcap_size to zero allows us to elimnate the subcap field */
tpm_cmd.header.in.length = cpu_to_be32(HEADER_SIZE + sizeof(struct tpm_getcap_params_in) - sizeof(tpm_cmd.params.getcap_in.subcap))
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [tpmdd-devel] [PATCH] tpm: fix a sparse error in tpm-interface.c
2017-01-31 19:10 ` [tpmdd-devel] " James Bottomley
@ 2017-01-31 20:52 ` Jarkko Sakkinen
0 siblings, 0 replies; 3+ messages in thread
From: Jarkko Sakkinen @ 2017-01-31 20:52 UTC (permalink / raw)
To: James Bottomley; +Cc: tpmdd-devel, open list, linux-security-module
On Tue, Jan 31, 2017 at 11:10:41AM -0800, James Bottomley wrote:
> On Tue, 2017-01-31 at 20:07 +0200, Jarkko Sakkinen wrote:
> > drivers/char/tpm//tpm-interface.c:492:42: warning: bad assignment (
> > -=)
> > to restricted __be32
> >
> > Fixes: 0883743825e3 ("TPM: sysfs functions consolidation")
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> > ---
> > drivers/char/tpm/tpm-interface.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm
> > -interface.c
> > index 423938e..746bc54 100644
> > --- a/drivers/char/tpm/tpm-interface.c
> > +++ b/drivers/char/tpm/tpm-interface.c
> > @@ -489,7 +489,7 @@ ssize_t tpm_getcap(struct tpm_chip *chip, u32
> > subcap_id, cap_t *cap,
> > tpm_cmd.params.getcap_in.cap =
> > cpu_to_be32(subcap_id);
> > /*subcap field not necessary */
> > tpm_cmd.params.getcap_in.subcap_size =
> > cpu_to_be32(0);
> > - tpm_cmd.header.in.length -=
> > cpu_to_be32(sizeof(__be32));
> > + tpm_cmd.header.in.length = cpu_to_be32(18);
>
> using bare numbers here without comment isn't really best practice.
> What about setting header.in.length in both legs of the if() to either
>
> tpm_cmd.header.in.length = cpu_to_be32(HEADER_SIZE + sizeof(struct tpm_getcap_params_in))
>
> or
>
> /* setting subcap_size to zero allows us to elimnate the subcap field */
> tpm_cmd.header.in.length = cpu_to_be32(HEADER_SIZE + sizeof(struct tpm_getcap_params_in) - sizeof(tpm_cmd.params.getcap_in.subcap))
Yeah, also the commit message should be updated rather than
referring to the static checking tool. I'll update the commit
along the lines you proposed...
/Jarkko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-31 20:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-31 18:07 [PATCH] tpm: fix a sparse error in tpm-interface.c Jarkko Sakkinen
2017-01-31 19:10 ` [tpmdd-devel] " James Bottomley
2017-01-31 20:52 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).