Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp960178rdg; Wed, 11 Oct 2023 10:04:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExGOQueZw618Tl7Z9CBaYQUC6b6nD3jNG/jGx37S8SR0DMm6VDD+xkv3AND/w7n7ixOmjR X-Received: by 2002:a17:90a:1f47:b0:27c:f8bd:9a98 with SMTP id y7-20020a17090a1f4700b0027cf8bd9a98mr3818014pjy.40.1697043850128; Wed, 11 Oct 2023 10:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697043850; cv=none; d=google.com; s=arc-20160816; b=XMvyZXstgFR4l0OsZpmk5OxjGlf1Bicrqgf+Z4BEqJ+OndsBzwdZv9jp/Y3nC83k4k 8vbs/ZojGTonhaLrx0kVuveRLi2+6pdXwR4TuNQJ0DOdVBtQLQk+sU5NPu/GImUVrmmu cxvkz7GWSGh5/CSLbaYDZFs0X0ib2k/8ZebLMr8PVc1EMm+K7c2LV1hTPDFQ/GzN3jxv 4wBxuVxhhIafiHPsB1pX+1u3IDHAFKs3A3TzIF6MsqQ5KySAgMUp9d2MBxP5z5chRkAO 7lcKlBI0s7/JogVNI03moss63uD6WRH/h9FM8BpJJbwJOpfRe0UmVh861xtqnzfNaPAg 1prg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent :content-transfer-encoding:references:in-reply-to:date:cc:to:from :subject:message-id; bh=TfiNdKsfdghHYTvPOnEyuZiqztxwrJHeATAe4gaSkek=; fh=O0r2yyLKgzC/xDsgN+j4ZZ5CJFiQloW50mImGLG1fZk=; b=w3iPg2mnkhhgsDEJ4uBMAE7Olww+6r8coSfsWna6XHgEHO6FUJQwjQe4ObSlaErCmY jRKImOIVmau3M16yHYAvsFGjwnfzUfX7YgA2E6F0G5iRs/QbGwjI/iptd8RuL8VCfJzb zI1GiWF5c/yj9QdDewEJ0pVGphGamEDFNLtnvV61Vs5Gn0EHsRM0EBMCp1Yz86/iiGSd W+4uMNLhvW8Y8gk9CLp3mngHApsMpslIsH3mebTi8sOZrzfxTFqqtoQPLnChzC48AApJ UKgG6m80kgLdll22EnrYwmLZ0t6jKHYCGQ/c+ih/VuCJOGCX6KuNAkMvWUu6Ap9bDdHL /s9A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bk21-20020a17090b081500b002700bcdbff1si215038pjb.154.2023.10.11.10.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 10:04:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 85D618135CD3; Wed, 11 Oct 2023 10:04:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235114AbjJKRD6 convert rfc822-to-8bit (ORCPT + 99 others); Wed, 11 Oct 2023 13:03:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347002AbjJKRD4 (ORCPT ); Wed, 11 Oct 2023 13:03:56 -0400 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E80A3AF for ; Wed, 11 Oct 2023 10:03:54 -0700 (PDT) Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[IPv6:::1]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qqccf-0005vR-JA; Wed, 11 Oct 2023 19:03:49 +0200 Message-ID: Subject: Re: [PATCH v2] drm/etnaviv: refactor deprecated strncpy From: Lucas Stach To: Justin Stitt , Russell King , Christian Gmeiner , David Airlie , Daniel Vetter Cc: etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Bo YU Date: Wed, 11 Oct 2023 19:03:47 +0200 In-Reply-To: <20230918-strncpy-drivers-gpu-drm-etnaviv-etnaviv_perfmon-c-v2-1-8ae12071c138@google.com> References: <20230918-strncpy-drivers-gpu-drm-etnaviv-etnaviv_perfmon-c-v2-1-8ae12071c138@google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:900:1d::77 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 11 Oct 2023 10:04:06 -0700 (PDT) X-Spam-Level: ** Am Montag, dem 18.09.2023 um 13:34 +0000 schrieb Justin Stitt: > `strncpy` is deprecated for use on NUL-terminated destination strings [1]. > > We should prefer more robust and less ambiguous string interfaces. > > A suitable replacement is `strscpy_pad` due to the fact that it > guarantees NUL-termination on the destination buffer whilst maintaining > the NUL-padding behavior that strncpy provides. > > Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] > Link: https://github.com/KSPP/linux/issues/90 > Cc: linux-hardening@vger.kernel.org > Cc: Bo YU > Signed-off-by: Justin Stitt Thanks, applied to my etnaviv/next branch. Regards, Lucas > --- > Changes in v2: > - use strscpy_pad (thanks Kees) > - Link to v1: https://lore.kernel.org/r/20230914-strncpy-drivers-gpu-drm-etnaviv-etnaviv_perfmon-c-v1-1-3adc2d9bfc52@google.com > --- > Similar to [2] which was never picked up. Let's prefer strscpy_pad to strlcpy, though > > [2]: https://lore.kernel.org/all/20190328080918.9290-1-tsu.yubo@gmail.com/ > --- > drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > index bafdfe49c1d8..dc9dea664a28 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > @@ -511,7 +511,7 @@ int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu, > > domain->id = domain->iter; > domain->nr_signals = dom->nr_signals; > - strncpy(domain->name, dom->name, sizeof(domain->name)); > + strscpy_pad(domain->name, dom->name, sizeof(domain->name)); > > domain->iter++; > if (domain->iter == nr_domains) > @@ -540,7 +540,7 @@ int etnaviv_pm_query_sig(struct etnaviv_gpu *gpu, > sig = &dom->signal[signal->iter]; > > signal->id = signal->iter; > - strncpy(signal->name, sig->name, sizeof(signal->name)); > + strscpy_pad(signal->name, sig->name, sizeof(signal->name)); > > signal->iter++; > if (signal->iter == dom->nr_signals) > > --- > base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec > change-id: 20230914-strncpy-drivers-gpu-drm-etnaviv-etnaviv_perfmon-c-dd095491dfde > > Best regards, > -- > Justin Stitt >