* [PATCH 2/2] tpm: fix buffer type in tpm_transimt/_cmd
@ 2018-03-05 12:48 ` Tomas Winkler
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Winkler @ 2018-03-05 12:48 UTC (permalink / raw)
To: linux-security-module
1. The buffer cannot be const as it is used both for send and receive.
2. Drop useless casting to u8 *, as this is already a
type of 'buf' parameter, it has just masked the 'const' issue.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/char/tpm/tpm-interface.c | 8 ++++----
drivers/char/tpm/tpm.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index cafec634181a..4afd95c83612 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -475,7 +475,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
if (rc)
goto out;
- rc = chip->ops->send(chip, (u8 *) buf, count);
+ rc = chip->ops->send(chip, buf, count);
if (rc < 0) {
if (rc != -EPIPE)
dev_err(&chip->dev,
@@ -512,7 +512,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
goto out;
out_recv:
- len = chip->ops->recv(chip, (u8 *) buf, bufsiz);
+ len = chip->ops->recv(chip, buf, bufsiz);
if (len < 0) {
rc = len;
dev_err(&chip->dev,
@@ -567,7 +567,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
* A positive number for a TPM error.
*/
ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
- const void *buf, size_t bufsiz,
+ void *buf, size_t bufsiz,
size_t min_rsp_body_length, unsigned int flags,
const char *desc)
{
@@ -575,7 +575,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
int err;
ssize_t len;
- len = tpm_transmit(chip, space, (u8 *)buf, bufsiz, flags);
+ len = tpm_transmit(chip, space, buf, bufsiz, flags);
if (len < 0)
return len;
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index b82b924d763c..50dcbf3b60aa 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -520,7 +520,7 @@ enum tpm_transmit_flags {
ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
u8 *buf, size_t bufsiz, unsigned int flags);
ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
- const void *buf, size_t bufsiz,
+ void *buf, size_t bufsiz,
size_t min_rsp_body_length, unsigned int flags,
const char *desc);
int tpm_startup(struct tpm_chip *chip);
--
2.14.3
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info@ http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 2/2] tpm: fix buffer type in tpm_transimt/_cmd
2018-03-05 12:48 ` Tomas Winkler
@ 2018-03-05 18:10 ` Jarkko Sakkinen
-1 siblings, 0 replies; 10+ messages in thread
From: Jarkko Sakkinen @ 2018-03-05 18:10 UTC (permalink / raw)
To: Tomas Winkler
Cc: Jason Gunthorpe, Alexander Usyskin, linux-integrity,
linux-security-module, linux-kernel
On Mon, Mar 05, 2018 at 02:48:26PM +0200, Tomas Winkler wrote:
> 1. The buffer cannot be const as it is used both for send and receive.
> 2. Drop useless casting to u8 *, as this is already a
> type of 'buf' parameter, it has just masked the 'const' issue.
>
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
> drivers/char/tpm/tpm-interface.c | 8 ++++----
> drivers/char/tpm/tpm.h | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index cafec634181a..4afd95c83612 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -475,7 +475,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> if (rc)
> goto out;
>
> - rc = chip->ops->send(chip, (u8 *) buf, count);
> + rc = chip->ops->send(chip, buf, count);
> if (rc < 0) {
> if (rc != -EPIPE)
> dev_err(&chip->dev,
> @@ -512,7 +512,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> goto out;
>
> out_recv:
> - len = chip->ops->recv(chip, (u8 *) buf, bufsiz);
> + len = chip->ops->recv(chip, buf, bufsiz);
> if (len < 0) {
> rc = len;
> dev_err(&chip->dev,
> @@ -567,7 +567,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> * A positive number for a TPM error.
> */
> ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> - const void *buf, size_t bufsiz,
> + void *buf, size_t bufsiz,
> size_t min_rsp_body_length, unsigned int flags,
> const char *desc)
> {
> @@ -575,7 +575,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> int err;
> ssize_t len;
>
> - len = tpm_transmit(chip, space, (u8 *)buf, bufsiz, flags);
> + len = tpm_transmit(chip, space, buf, bufsiz, flags);
> if (len < 0)
> return len;
>
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index b82b924d763c..50dcbf3b60aa 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -520,7 +520,7 @@ enum tpm_transmit_flags {
> ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> u8 *buf, size_t bufsiz, unsigned int flags);
> ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> - const void *buf, size_t bufsiz,
> + void *buf, size_t bufsiz,
> size_t min_rsp_body_length, unsigned int flags,
> const char *desc);
> int tpm_startup(struct tpm_chip *chip);
> --
> 2.14.3
>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 2/2] tpm: fix buffer type in tpm_transimt/_cmd
@ 2018-03-05 18:10 ` Jarkko Sakkinen
0 siblings, 0 replies; 10+ messages in thread
From: Jarkko Sakkinen @ 2018-03-05 18:10 UTC (permalink / raw)
To: linux-security-module
On Mon, Mar 05, 2018 at 02:48:26PM +0200, Tomas Winkler wrote:
> 1. The buffer cannot be const as it is used both for send and receive.
> 2. Drop useless casting to u8 *, as this is already a
> type of 'buf' parameter, it has just masked the 'const' issue.
>
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
> drivers/char/tpm/tpm-interface.c | 8 ++++----
> drivers/char/tpm/tpm.h | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index cafec634181a..4afd95c83612 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -475,7 +475,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> if (rc)
> goto out;
>
> - rc = chip->ops->send(chip, (u8 *) buf, count);
> + rc = chip->ops->send(chip, buf, count);
> if (rc < 0) {
> if (rc != -EPIPE)
> dev_err(&chip->dev,
> @@ -512,7 +512,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> goto out;
>
> out_recv:
> - len = chip->ops->recv(chip, (u8 *) buf, bufsiz);
> + len = chip->ops->recv(chip, buf, bufsiz);
> if (len < 0) {
> rc = len;
> dev_err(&chip->dev,
> @@ -567,7 +567,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> * A positive number for a TPM error.
> */
> ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> - const void *buf, size_t bufsiz,
> + void *buf, size_t bufsiz,
> size_t min_rsp_body_length, unsigned int flags,
> const char *desc)
> {
> @@ -575,7 +575,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> int err;
> ssize_t len;
>
> - len = tpm_transmit(chip, space, (u8 *)buf, bufsiz, flags);
> + len = tpm_transmit(chip, space, buf, bufsiz, flags);
> if (len < 0)
> return len;
>
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index b82b924d763c..50dcbf3b60aa 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -520,7 +520,7 @@ enum tpm_transmit_flags {
> ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> u8 *buf, size_t bufsiz, unsigned int flags);
> ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> - const void *buf, size_t bufsiz,
> + void *buf, size_t bufsiz,
> size_t min_rsp_body_length, unsigned int flags,
> const char *desc);
> int tpm_startup(struct tpm_chip *chip);
> --
> 2.14.3
>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
/Jarkko
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] tpm: fix buffer type in tpm_transimt/_cmd
2018-03-05 12:48 ` Tomas Winkler
@ 2018-03-05 18:12 ` Jarkko Sakkinen
-1 siblings, 0 replies; 10+ messages in thread
From: Jarkko Sakkinen @ 2018-03-05 18:12 UTC (permalink / raw)
To: Tomas Winkler
Cc: Jason Gunthorpe, Alexander Usyskin, linux-integrity,
linux-security-module, linux-kernel
On Mon, Mar 05, 2018 at 02:48:26PM +0200, Tomas Winkler wrote:
> 1. The buffer cannot be const as it is used both for send and receive.
> 2. Drop useless casting to u8 *, as this is already a
> type of 'buf' parameter, it has just masked the 'const' issue.
>
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
> drivers/char/tpm/tpm-interface.c | 8 ++++----
> drivers/char/tpm/tpm.h | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index cafec634181a..4afd95c83612 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -475,7 +475,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> if (rc)
> goto out;
>
> - rc = chip->ops->send(chip, (u8 *) buf, count);
> + rc = chip->ops->send(chip, buf, count);
> if (rc < 0) {
> if (rc != -EPIPE)
> dev_err(&chip->dev,
> @@ -512,7 +512,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> goto out;
>
> out_recv:
> - len = chip->ops->recv(chip, (u8 *) buf, bufsiz);
> + len = chip->ops->recv(chip, buf, bufsiz);
> if (len < 0) {
> rc = len;
> dev_err(&chip->dev,
> @@ -567,7 +567,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> * A positive number for a TPM error.
> */
> ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> - const void *buf, size_t bufsiz,
> + void *buf, size_t bufsiz,
> size_t min_rsp_body_length, unsigned int flags,
> const char *desc)
> {
> @@ -575,7 +575,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> int err;
> ssize_t len;
>
> - len = tpm_transmit(chip, space, (u8 *)buf, bufsiz, flags);
> + len = tpm_transmit(chip, space, buf, bufsiz, flags);
> if (len < 0)
> return len;
>
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index b82b924d763c..50dcbf3b60aa 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -520,7 +520,7 @@ enum tpm_transmit_flags {
> ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> u8 *buf, size_t bufsiz, unsigned int flags);
> ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> - const void *buf, size_t bufsiz,
> + void *buf, size_t bufsiz,
> size_t min_rsp_body_length, unsigned int flags,
> const char *desc);
> int tpm_startup(struct tpm_chip *chip);
> --
> 2.14.3
>
Thanks, these changes have applied.
/Jarkko
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 2/2] tpm: fix buffer type in tpm_transimt/_cmd
@ 2018-03-05 18:12 ` Jarkko Sakkinen
0 siblings, 0 replies; 10+ messages in thread
From: Jarkko Sakkinen @ 2018-03-05 18:12 UTC (permalink / raw)
To: linux-security-module
On Mon, Mar 05, 2018 at 02:48:26PM +0200, Tomas Winkler wrote:
> 1. The buffer cannot be const as it is used both for send and receive.
> 2. Drop useless casting to u8 *, as this is already a
> type of 'buf' parameter, it has just masked the 'const' issue.
>
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
> ---
> drivers/char/tpm/tpm-interface.c | 8 ++++----
> drivers/char/tpm/tpm.h | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> index cafec634181a..4afd95c83612 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -475,7 +475,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> if (rc)
> goto out;
>
> - rc = chip->ops->send(chip, (u8 *) buf, count);
> + rc = chip->ops->send(chip, buf, count);
> if (rc < 0) {
> if (rc != -EPIPE)
> dev_err(&chip->dev,
> @@ -512,7 +512,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> goto out;
>
> out_recv:
> - len = chip->ops->recv(chip, (u8 *) buf, bufsiz);
> + len = chip->ops->recv(chip, buf, bufsiz);
> if (len < 0) {
> rc = len;
> dev_err(&chip->dev,
> @@ -567,7 +567,7 @@ ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> * A positive number for a TPM error.
> */
> ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> - const void *buf, size_t bufsiz,
> + void *buf, size_t bufsiz,
> size_t min_rsp_body_length, unsigned int flags,
> const char *desc)
> {
> @@ -575,7 +575,7 @@ ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> int err;
> ssize_t len;
>
> - len = tpm_transmit(chip, space, (u8 *)buf, bufsiz, flags);
> + len = tpm_transmit(chip, space, buf, bufsiz, flags);
> if (len < 0)
> return len;
>
> diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
> index b82b924d763c..50dcbf3b60aa 100644
> --- a/drivers/char/tpm/tpm.h
> +++ b/drivers/char/tpm/tpm.h
> @@ -520,7 +520,7 @@ enum tpm_transmit_flags {
> ssize_t tpm_transmit(struct tpm_chip *chip, struct tpm_space *space,
> u8 *buf, size_t bufsiz, unsigned int flags);
> ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_space *space,
> - const void *buf, size_t bufsiz,
> + void *buf, size_t bufsiz,
> size_t min_rsp_body_length, unsigned int flags,
> const char *desc);
> int tpm_startup(struct tpm_chip *chip);
> --
> 2.14.3
>
Thanks, these changes have applied.
/Jarkko
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 10+ messages in thread