From patchwork Thu Sep 14 18:20:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 139847 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp635044vqi; Thu, 14 Sep 2023 14:26:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFMve2+Y8Uimy7UTWPRBxDL9YOPY/sf8k98cT2wRW2om1MvnqydBC6vM6xYyaShmh19xHZe X-Received: by 2002:a05:6358:9308:b0:139:9dda:8344 with SMTP id x8-20020a056358930800b001399dda8344mr6703171rwa.19.1694726802749; Thu, 14 Sep 2023 14:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694726802; cv=none; d=google.com; s=arc-20160816; b=rbWAwZsCk8Qh8g/NXlcs12qKmD0/aXt52CXCck27piMMTt7lNFr33cWvTduq6utvrk +ywtIqrbrQu6ZodSQMiKM9dvzJqc1iA/MCK6WFBvENwXZjCriAc7uBpyDook5i9uv+BC SLoqb84U2PUIjFzk/eOSWLKTq1FsxJxCGUBrd6vLaiRvMhfFLDFbEdVuKaciypln24/v VbnS/ysJ75KpVG2JtgJF20GrJTUby2olOtEVomA8l5TwJGcoKDuogJEcvzNk/a1jc6Ji JXeAncST2Kyko1yi94XU+aVEX5e2/mEU52LotctXqxAi+yCzVv1XjqEChBvOkDWMUvGO Xk6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=+tDCVePA3H/Y86jExEhecx21ZlR+zsTby9yjOcJea7c=; fh=vlA5caOkx4pOrZ0beLoHBmEjXepKTz4tbt1iLqY3g2I=; b=t4FhZwz/MtgWmIU65zEHF9rmzCExXLBPKDaet4G8VKrpSec95DMGHneoTCfJY7styY GEdYAMkNMoNac77Wh58WdNeMcfHSPLrqV8xQKjp7DtohYSSncDw1L5g3WpVIdnkHJabO xA6Z8z04AgwEAlmhPjR3izy46HTPozBF7cxx15tA2EyRTOlaOkcBq/qhTZyKfqRFJt6a nw8rqVcv1HtGNhmwjsFQ+gvZQFr1avSLWXUMnH3r72F1gmGECyoReWwKUyJb9CAuFEEq TG7bPl5nVpRTS8i1HOJDe7kGtdxuYkbfHe/DlGTQrXcwlxsubxxdlroZPISMKnxWRO6j e5ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=y4bVZvSQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id h71-20020a63834a000000b00573fc71f6d6si2173044pge.6.2023.09.14.14.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 14:26:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=y4bVZvSQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id F053683C1914; Thu, 14 Sep 2023 11:20:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240690AbjINSUK (ORCPT + 33 others); Thu, 14 Sep 2023 14:20:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239368AbjINSUG (ORCPT ); Thu, 14 Sep 2023 14:20:06 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 867C31FD7 for ; Thu, 14 Sep 2023 11:20:02 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-59c0327b75dso5664107b3.2 for ; Thu, 14 Sep 2023 11:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694715602; x=1695320402; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=+tDCVePA3H/Y86jExEhecx21ZlR+zsTby9yjOcJea7c=; b=y4bVZvSQiOReVX7uln3vq6mtDU0S/N5cg/O+gj6aClRcmHGVMj/49ZoNvIBZq8Y7u6 JgPVVLqLKWeGntJG60jwo0SFhhP52nQG+n9NnViawtaX9cfJPdgMvLZqcUUzXxhNexsX VATAVd5F+XkOFQ6acORyK95BclERXTGl3vU//U1JSGkIM1pdSsxCDDoNeCSonHhmzePd XaYAIaW9Hknsel04Sga/Qf6G+hFQ1q/MeLSrpBOQaKV8ZimNHYerf6GqwWMR3Sq180sH eu4xq9nD5u+S2j1LPZvWDb7iEqrxT2ovJfxbPLbPVRjeCpn/UIM7p6G6eNqqpYgZbqvd RC2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694715602; x=1695320402; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+tDCVePA3H/Y86jExEhecx21ZlR+zsTby9yjOcJea7c=; b=gwQul3sx6T+hLslEEZKq74cTlfGwLxqVwYhrFXJlZ0zNb2FjxZ+Zi3kXaFLa2/CFHt LL1PssqmJmEYWV/6IvXbY7w4JL3GB3XEy1NApiV73Kgy2mvjVxJph+FSFiq/F5c6Ra8j GIa/1vl6XFLRBW7vDaN4adUqG17DsqXzbd/whLuanuv6kKR1yZgUTNrXHF4Ex5cRJOmm I0o49sxCZYQaUiQbJf5ATFEkHCsjHQXmSbGVmQl5HbNBYCSKiJ90Ul4sDTBeovHvRSoV GNBO98UqUM21NPMHUukv5al4mkxiPACBC6tIzef6HqgsuBnxp62W5JVGjz3ueCL0UnOF f3Nw== X-Gm-Message-State: AOJu0YyVkr4VCfIXevR9Zhskv9WK3hMw9w4nL6bC3UX1e6nvGzk9D2nh yYbTA7I16fHcTkxZfN7YSNEnR9fQNd999aWXpQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:abaf:0:b0:d77:bcce:eb11 with SMTP id v44-20020a25abaf000000b00d77bcceeb11mr135467ybi.10.1694715601838; Thu, 14 Sep 2023 11:20:01 -0700 (PDT) Date: Thu, 14 Sep 2023 18:20:01 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIANBOA2UC/zWNQQrDMAwEvxJ0rsBO0oP7lVJKsORUhyhGTk1Ly N9jCj3NzmVnh8ImXODW7WBcpciqTfylg/iadGYUag696wcX/IhlM435i2RS2QrO+d32grzpVKX ++cxsaVkVIxK5cB2Dp0QM7TcbJ/n8mvfHcZxWgPpkgwAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1694715600; l=1992; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=SeuSKp981fs1thsOAOeS7EP9Ar4X1zn644iwNj5mbW0=; b=BWw2xpB4+Q0ImJXqA281cKFhurR2PsXPzdhCXMjsCWc7SsHnWYgeKtLVUn9zKZtXCCIxlq54x Lllt8bVOVZ2DwqP3B3RwgpiECJ3K+prluKT70wJhl50BC6TEYxoRCPO X-Mailer: b4 0.12.3 Message-ID: <20230914-strncpy-drivers-gpu-drm-etnaviv-etnaviv_perfmon-c-v1-1-3adc2d9bfc52@google.com> Subject: [PATCH] drm/etnaviv: refactor deprecated strncpy From: Justin Stitt To: Lucas Stach , 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 , Justin Stitt 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 (pete.vger.email [0.0.0.0]); Thu, 14 Sep 2023 11:20:20 -0700 (PDT) X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777049851932372318 X-GMAIL-MSGID: 1777049851932372318 `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` [2] due to the fact that it guarantees NUL-termination on the destination buffer. Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: https://github.com/KSPP/linux/issues/90 Cc: linux-hardening@vger.kernel.org Cc: Bo YU Signed-off-by: Justin Stitt --- Similar to [1] which was never picked up. Let's prefer strscpy to strlcpy, though [1]: 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(-) --- base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec change-id: 20230914-strncpy-drivers-gpu-drm-etnaviv-etnaviv_perfmon-c-dd095491dfde Best regards, -- Justin Stitt diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c index bafdfe49c1d8..9e7bebcf24eb 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(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(signal->name, sig->name, sizeof(signal->name)); signal->iter++; if (signal->iter == dom->nr_signals)