From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9259EB64DC for ; Wed, 14 Jun 2023 19:23:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236187AbjFNTXC convert rfc822-to-8bit (ORCPT ); Wed, 14 Jun 2023 15:23:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231499AbjFNTXA (ORCPT ); Wed, 14 Jun 2023 15:23:00 -0400 Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0A7D26AB; Wed, 14 Jun 2023 12:22:37 -0700 (PDT) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost.zedat.fu-berlin.de (Exim 4.95) with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1q9W4f-002h8x-3E; Wed, 14 Jun 2023 21:22:33 +0200 Received: from p57bd9486.dip0.t-ipconnect.de ([87.189.148.134] helo=[192.168.178.81]) by inpost2.zedat.fu-berlin.de (Exim 4.95) with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1q9W4e-0012Wx-KO; Wed, 14 Jun 2023 21:22:33 +0200 Message-ID: <63d247d3de5a0ca289c39dff930f83d7bbc7c4a5.camel@physik.fu-berlin.de> Subject: Re: [PATCH] sh: Replace all non-returning strlcpy with strscpy From: John Paul Adrian Glaubitz To: Azeem Shaikh , Yoshinori Sato , Rich Felker Cc: linux-hardening@vger.kernel.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, Randy Dunlap Date: Wed, 14 Jun 2023 21:22:31 +0200 In-Reply-To: <20230530163041.985456-1-azeemshaikh38@gmail.com> References: <20230530163041.985456-1-azeemshaikh38@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT User-Agent: Evolution 3.48.3 MIME-Version: 1.0 X-Original-Sender: glaubitz@physik.fu-berlin.de X-Originating-IP: 87.189.148.134 X-ZEDAT-Hint: PO Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2023-05-30 at 16:30 +0000, 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 > --- > arch/sh/drivers/dma/dma-api.c | 2 +- > arch/sh/kernel/setup.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c > index ab9170494dcc..89cd4a3b4cca 100644 > --- a/arch/sh/drivers/dma/dma-api.c > +++ b/arch/sh/drivers/dma/dma-api.c > @@ -198,7 +198,7 @@ int request_dma(unsigned int chan, const char *dev_id) > if (atomic_xchg(&channel->busy, 1)) > return -EBUSY; > > - strlcpy(channel->dev_id, dev_id, sizeof(channel->dev_id)); > + strscpy(channel->dev_id, dev_id, sizeof(channel->dev_id)); > > if (info->ops->request) { > result = info->ops->request(channel); > diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c > index af977ec4ca5e..e4f0f9a1d355 100644 > --- a/arch/sh/kernel/setup.c > +++ b/arch/sh/kernel/setup.c > @@ -304,9 +304,9 @@ void __init setup_arch(char **cmdline_p) > bss_resource.end = virt_to_phys(__bss_stop)-1; > > #ifdef CONFIG_CMDLINE_OVERWRITE > - strlcpy(command_line, CONFIG_CMDLINE, sizeof(command_line)); > + strscpy(command_line, CONFIG_CMDLINE, sizeof(command_line)); > #else > - strlcpy(command_line, COMMAND_LINE, sizeof(command_line)); > + strscpy(command_line, COMMAND_LINE, sizeof(command_line)); > #ifdef CONFIG_CMDLINE_EXTEND > strlcat(command_line, " ", sizeof(command_line)); > strlcat(command_line, CONFIG_CMDLINE, sizeof(command_line)); Tested-by: John Paul Adrian Glaubitz -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913