linux-hardening - Re: [PATCH] KEYS: Replace all non-returning strlcpy with strscpy

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <CSU5WB51YOBW.3IYPGJ2QG8GLK@suppilovahvero>
Date:   Wed, 24 May 2023 05:45:18 +0300
From:   "Jarkko Sakkinen" <jarkko@...nel.org>
To:     "Paul Moore" <paul@...l-moore.com>
Cc:     "Azeem Shaikh" <azeemshaikh38@...il.com>,
        "David Howells" <dhowells@...hat.com>,
        <linux-hardening@...r.kernel.org>, <keyrings@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>, "James Morris" <jmorris@...ei.org>,
        "Serge E. Hallyn" <serge@...lyn.com>,
        <linux-security-module@...r.kernel.org>
Subject: Re: [PATCH] KEYS: Replace all non-returning strlcpy with strscpy

On Sat May 20, 2023 at 12:11 AM EEST, Paul Moore wrote:
> On Thu, May 18, 2023 at 2:01 PM Jarkko Sakkinen <jarkko@...nel.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@...il.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@...nel.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?

I can pick it.

BR, Jarkko