2022-07-04 03:26:16

by Li zeming

Subject: [PATCH] keys/keyring: Fix typo in string

Remove the repeated ',' from string

Signed-off-by: Li zeming <[email protected]>
---
security/keys/keyring.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 5e6a90760753..c6c47ca9b57d 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -460,7 +460,7 @@ static int keyring_read_iterator(const void *object, void *data)
struct keyring_read_iterator_context *ctx = data;
const struct key *key = keyring_ptr_to_key(object);

- kenter("{%s,%d},,{%zu/%zu}",
+ kenter("{%s,%d},{%zu/%zu}",
key->type->name, key->serial, ctx->count, ctx->buflen);

if (ctx->count >= ctx->buflen)
@@ -484,7 +484,7 @@ static long keyring_read(const struct key *keyring,
struct keyring_read_iterator_context ctx;
long ret;

- kenter("{%d},,%zu", key_serial(keyring), buflen);
+ kenter("{%d},%zu", key_serial(keyring), buflen);

if (buflen & (sizeof(key_serial_t) - 1))
return -EINVAL;
--
2.18.2

2022-07-05 14:39:07

by David Howells

Subject: Re: [PATCH] keys/keyring: Fix typo in string

Li zeming <[email protected]> wrote:

> - kenter("{%s,%d},,{%zu/%zu}",
> + kenter("{%s,%d},{%zu/%zu}",
> key->type->name, key->serial, ctx->count, ctx->buflen);

This changed, so yes, it can be fixed.

> - kenter("{%d},,%zu", key_serial(keyring), buflen);
> + kenter("{%d},%zu", key_serial(keyring), buflen);

This one's not a typo.

David

2022-07-11 03:48:58

by Jarkko Sakkinen

Subject: Re: [PATCH] keys/keyring: Fix typo in string

On Mon, Jul 04, 2022 at 10:56:10AM +0800, Li zeming wrote:
> Remove the repeated ',' from string
>
> Signed-off-by: Li zeming <[email protected]>
> ---
> security/keys/keyring.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/security/keys/keyring.c b/security/keys/keyring.c
> index 5e6a90760753..c6c47ca9b57d 100644
> --- a/security/keys/keyring.c
> +++ b/security/keys/keyring.c
> @@ -460,7 +460,7 @@ static int keyring_read_iterator(const void *object, void *data)
> struct keyring_read_iterator_context *ctx = data;
> const struct key *key = keyring_ptr_to_key(object);
>
> - kenter("{%s,%d},,{%zu/%zu}",
> + kenter("{%s,%d},{%zu/%zu}",
> key->type->name, key->serial, ctx->count, ctx->buflen);
>
> if (ctx->count >= ctx->buflen)
> @@ -484,7 +484,7 @@ static long keyring_read(const struct key *keyring,
> struct keyring_read_iterator_context ctx;
> long ret;
>
> - kenter("{%d},,%zu", key_serial(keyring), buflen);
> + kenter("{%d},%zu", key_serial(keyring), buflen);
>
> if (buflen & (sizeof(key_serial_t) - 1))
> return -EINVAL;
> --
> 2.18.2
>

Reviewed-by: Jarkko Sakkinen <[email protected]>

BR, Jarkko