Messages in this thread | | | From | Paul Moore <> | Date | Fri, 19 May 2023 17:11:14 -0400 | Subject | Re: [PATCH] KEYS: Replace all non-returning strlcpy with strscpy |
| |
On Thu, May 18, 2023 at 2:01 PM Jarkko Sakkinen <jarkko@kernel.org> wrote: > On Thu May 18, 2023 at 7:15 AM EEST, Azeem Shaikh wrote: > > strlcpy() reads the entire source buffer first. > > This read may exceed the destination size limit. > > This is both inefficient and can lead to linear read > > overflows if a source string is not NUL-terminated [1]. > > In an effort to remove strlcpy() completely [2], replace > > strlcpy() here with strscpy(). > > No return values were used, so direct replacement is safe. > > > > [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy > > [2] https://github.com/KSPP/linux/issues/89 > > > > Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com> > > --- > > security/keys/request_key_auth.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c > > index 41e9735006d0..8f33cd170e42 100644 > > --- a/security/keys/request_key_auth.c > > +++ b/security/keys/request_key_auth.c > > @@ -178,7 +178,7 @@ struct key *request_key_auth_new(struct key *target, const char *op, > > if (!rka->callout_info) > > goto error_free_rka; > > rka->callout_len = callout_len; > > - strlcpy(rka->op, op, sizeof(rka->op)); > > + strscpy(rka->op, op, sizeof(rka->op)); > > > > /* see if the calling process is already servicing the key request of > > * another process */ > > > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Since you maintain this code Jarkko, are you planning to merge this into your tree or would you prefer the KSPP folks merge it?
-- paul-moore.com
| |