fTPM: fix PTR_ERR() usage
diff mbox series

Message ID 20190712114951.912328-1-arnd@arndb.de
State New
Headers show
Series
  • fTPM: fix PTR_ERR() usage
Related show

Commit Message

Arnd Bergmann July 12, 2019, 11:49 a.m. UTC
A last minute change must have confused PTR_ERR() and ERR_PTR():

drivers/char/tpm/tpm_ftpm_tee.c:236:15: error: incompatible pointer to integer conversion passing 'struct tee_context *' to parameter of type 'long' [-Werror,-Wint-conversion]
                if (ERR_PTR(pvt_data->ctx) == -ENOENT)
drivers/char/tpm/tpm_ftpm_tee.c:239:18: error: incompatible pointer to integer conversion passing 'struct tee_context *' to parameter of type 'long' [-Werror,-Wint-conversion]
                return ERR_PTR(pvt_data->ctx);

Fixes: c975c3911cc2 ("fTPM: firmware TPM running in TEE")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/char/tpm/tpm_ftpm_tee.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jarkko Sakkinen July 12, 2019, 3:34 p.m. UTC | #1
On Fri, 2019-07-12 at 13:49 +0200, Arnd Bergmann wrote:
> A last minute change must have confused PTR_ERR() and ERR_PTR():
> 
> drivers/char/tpm/tpm_ftpm_tee.c:236:15: error: incompatible pointer to integer
> conversion passing 'struct tee_context *' to parameter of type 'long' [-
> Werror,-Wint-conversion]
>                 if (ERR_PTR(pvt_data->ctx) == -ENOENT)
> drivers/char/tpm/tpm_ftpm_tee.c:239:18: error: incompatible pointer to integer
> conversion passing 'struct tee_context *' to parameter of type 'long' [-
> Werror,-Wint-conversion]
>                 return ERR_PTR(pvt_data->ctx);
> 
> Fixes: c975c3911cc2 ("fTPM: firmware TPM running in TEE")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd, thanks.

I squashed this to the associated commit.

I also fine-tuned the commit messages a bit (tag, imperative form).

Started also wondering tha tpm_ftpm_tee is a too generic name given that
this is for ARM TZ only. Would it make sense to rename it as something
like tpm_ftpm_tee_arm? Other proposals are welcome. Just made something
up.


/Jarkko
Sasha Levin July 13, 2019, 3:10 p.m. UTC | #2
On Fri, Jul 12, 2019 at 06:34:24PM +0300, Jarkko Sakkinen wrote:
>On Fri, 2019-07-12 at 13:49 +0200, Arnd Bergmann wrote:
>> A last minute change must have confused PTR_ERR() and ERR_PTR():
>>
>> drivers/char/tpm/tpm_ftpm_tee.c:236:15: error: incompatible pointer to integer
>> conversion passing 'struct tee_context *' to parameter of type 'long' [-
>> Werror,-Wint-conversion]
>>                 if (ERR_PTR(pvt_data->ctx) == -ENOENT)
>> drivers/char/tpm/tpm_ftpm_tee.c:239:18: error: incompatible pointer to integer
>> conversion passing 'struct tee_context *' to parameter of type 'long' [-
>> Werror,-Wint-conversion]
>>                 return ERR_PTR(pvt_data->ctx);
>>
>> Fixes: c975c3911cc2 ("fTPM: firmware TPM running in TEE")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
>Arnd, thanks.
>
>I squashed this to the associated commit.
>
>I also fine-tuned the commit messages a bit (tag, imperative form).

Yes, thank you!

>Started also wondering tha tpm_ftpm_tee is a too generic name given that
>this is for ARM TZ only. Would it make sense to rename it as something
>like tpm_ftpm_tee_arm? Other proposals are welcome. Just made something
>up.

Hm, isn't the _tee part enough?

--
Thanks,
Sasha
Jarkko Sakkinen July 14, 2019, 2:38 p.m. UTC | #3
On Sat, Jul 13, 2019 at 11:10:59AM -0400, Sasha Levin wrote:
> > Started also wondering tha tpm_ftpm_tee is a too generic name given that
> > this is for ARM TZ only. Would it make sense to rename it as something
> > like tpm_ftpm_tee_arm? Other proposals are welcome. Just made something
> > up.
> 
> Hm, isn't the _tee part enough?

Not sure, Trusted Execution Environment sounds something that could be
potentially used outside of ARM scope.

/Jarkko

Patch
diff mbox series

diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c
index 74766a4d3280..5679a5af9a96 100644
--- a/drivers/char/tpm/tpm_ftpm_tee.c
+++ b/drivers/char/tpm/tpm_ftpm_tee.c
@@ -233,10 +233,10 @@  static int ftpm_tee_probe(struct platform_device *pdev)
 	pvt_data->ctx = tee_client_open_context(NULL, ftpm_tee_match, NULL,
 						NULL);
 	if (IS_ERR(pvt_data->ctx)) {
-		if (ERR_PTR(pvt_data->ctx) == -ENOENT)
+		if (PTR_ERR(pvt_data->ctx) == -ENOENT)
 			return -EPROBE_DEFER;
 		dev_err(dev, "%s: tee_client_open_context failed\n", __func__);
-		return ERR_PTR(pvt_data->ctx);
+		return PTR_ERR(pvt_data->ctx);
 	}
 
 	/* Open a session with fTPM TA */