Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230703180528.3709258-1-azeemshaikh38@gmail.com> <ad25bb8552704028860cf7a419c54fa3@AcuMS.aculab.com>
In-Reply-To: <ad25bb8552704028860cf7a419c54fa3@AcuMS.aculab.com>
From:   Azeem Shaikh <azeemshaikh38@gmail.com>
Date:   Mon, 10 Jul 2023 14:06:44 -0400
Message-ID: <CADmuW3XOcGDBszYw80Dy03DXk3T25k8FNUrJWLKU9tL2znzanw@mail.gmail.com>
Subject: Re: [PATCH] kobject: Replace strlcpy with strscpy
To:     David Laight <David.Laight@aculab.com>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "linux-hardening@vger.kernel.org" <linux-hardening@vger.kernel.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jul 10, 2023 at 9:13=E2=80=AFAM David Laight <David.Laight@aculab.c=
om> wrote:
>
> >       int len;
> >
> > -     len =3D strlcpy(&env->buf[env->buflen], subsystem, buffer_size);
> > -     if (len >=3D buffer_size) {
> > +     len =3D strscpy(&env->buf[env->buflen], subsystem, buffer_size);
> > +     if (len < 0) {
> >               pr_warn("init_uevent_argv: buffer size of %d too small, n=
eeded %d\n",
> >                       buffer_size, len);
> >               return -ENOMEM;
>
> The size in the error message is now wrong.

Thanks for catching this.

> It has to be said that mostly all the strings that get copied
> in the kernel are '\0' terminated - so maybe it is all moot.
> OTOH printing (at least some of) the string that didn't fit
> is a lot more useful than its length.

How about printing out strlen(subsystem) along with the entire value
of @subsystem? So that the warn reads:

pr_warn("init_uevent_argv: buffer size of %d too small for %s, needed
%d\n", buffer_size, subsystem, strlen(subsystem));

Does that seem better?