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: <20230530160033.411441-1-azeemshaikh38@gmail.com>
In-Reply-To: <20230530160033.411441-1-azeemshaikh38@gmail.com>
From:   Azeem Shaikh <azeemshaikh38@gmail.com>
Date:   Tue, 30 May 2023 12:08:57 -0400
Message-ID: <CADmuW3Vgraciy__V24wHF0fBstT8odmMm6t1bUxZLeyFi9P6fQ@mail.gmail.com>
Subject: Re: [PATCH] soc: fsl: qe: Replace all non-returning strlcpy with strscpy
To:     Qiang Zhao <qiang.zhao@nxp.com>
Cc:     linux-hardening@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
        linux-kernel@vger.kernel.org, Li Yang <leoyang.li@nxp.com>,
        linux-arm-kernel@lists.infradead.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Duplicate of https://lore.kernel.org/all/20230523021425.2406309-1-azeemshai=
kh38@gmail.com/.
Sorry about that.

On Tue, May 30, 2023 at 12:00=E2=80=AFPM Azeem Shaikh <azeemshaikh38@gmail.=
com> 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#strlcp=
y
> [2] https://github.com/KSPP/linux/issues/89
>
> Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
> ---
>  drivers/soc/fsl/qe/qe.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/fsl/qe/qe.c b/drivers/soc/fsl/qe/qe.c
> index b3c226eb5292..58746e570d14 100644
> --- a/drivers/soc/fsl/qe/qe.c
> +++ b/drivers/soc/fsl/qe/qe.c
> @@ -524,7 +524,7 @@ int qe_upload_firmware(const struct qe_firmware *firm=
ware)
>          * saved microcode information and put in the new.
>          */
>         memset(&qe_firmware_info, 0, sizeof(qe_firmware_info));
> -       strlcpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_inf=
o.id));
> +       strscpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_inf=
o.id));
>         qe_firmware_info.extended_modes =3D be64_to_cpu(firmware->extende=
d_modes);
>         memcpy(qe_firmware_info.vtraps, firmware->vtraps,
>                 sizeof(firmware->vtraps));
> @@ -599,7 +599,7 @@ struct qe_firmware_info *qe_get_firmware_info(void)
>         /* Copy the data into qe_firmware_info*/
>         sprop =3D of_get_property(fw, "id", NULL);
>         if (sprop)
> -               strlcpy(qe_firmware_info.id, sprop,
> +               strscpy(qe_firmware_info.id, sprop,
>                         sizeof(qe_firmware_info.id));
>
>         of_property_read_u64(fw, "extended-modes",
>