Message ID | 20230914-strncpy-drivers-gpu-drm-nouveau-nvkm-core-firmware-c-v1-1-3aeae46c032f@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp801789vqi; Thu, 14 Sep 2023 21:37:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJzPTG6V3NtE96gFMLy4LjXVtAiSxEye398uWF3KSfAFEXecEQ6icgDsKG6ekFufvpumNp X-Received: by 2002:a05:6a00:b8e:b0:68f:fa41:4e92 with SMTP id g14-20020a056a000b8e00b0068ffa414e92mr655398pfj.1.1694752657776; Thu, 14 Sep 2023 21:37:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694752657; cv=none; d=google.com; s=arc-20160816; b=ccKVY0cqNiVmKoKYGGGRuvJjqe4stPllU6YRfYFTU/ndOhEWUtjVIVZclwthg8KhWh CdGUprxWxHmIGYrJR6qQRUcgMcggwQDMiu2cFqLL4uml2TZ5tT0XKY4Z2YDzJl+CLQi3 91DSJjmN1zjROzEeeIYDhAVHQ1Wse6uSGsi6eYo27yD8V7487r8r4/GmxfezHgn92BdB yvFN/lwAeCSoyvuAgrq8iqaOPKgccLvjvBJcwGC619a1VjX7AALnjcF5JTqhyfayv2He etpKeqrzO14rLM2KzQevCKD0de20nkBqTVgLLTlUGQbSp+7YGYWj6x0kiKDsZ4GmX9g0 Z0Tw== 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=yg6NbhhS6bNBw/im5wDGZLYsqmgcXnTvleG//pORS78=; fh=TMnX3hdDehmouwKzg+0Re2/fuE6OgICJ/TdSGa29jbM=; b=nFiuXPiGqZvabfNrMC5Qs0mq32KA8p4TEUw7dPFA2qk9+pGBvmawcTtGAds5YTQOpC AwkiaL1PmWHusXM/OndlOVuSUlVeAynW2kocKfS+TZkNpI7xgrO5SBOXuNAW9G4uj0kP 4uBxk8PGKuqPOyrdWlkYFEOO96Vb7tRoMuEPj44pdzDi0aTleEZJmMEhvMNNvGrKX+2g HqfjvuoQW7voQfLvWbzj7HpDXHLIwdBbsbQU169e0OLYD5TiHlgsPfLDYjOxfAQD0zwd 2mTcrmFBd/ZDFXFMITIVXwjJzWpo1NCUqptOs6xzKkvLSuGymCCb3PSo+OYGEhJeEVLv TpJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=0aVZQDcP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id p31-20020a056a000a1f00b0068a53e61fdcsi2770554pfh.26.2023.09.14.21.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 21:37:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=0aVZQDcP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 0C070837D97A; Thu, 14 Sep 2023 14:41:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229654AbjINVk4 (ORCPT <rfc822;pwkd43@gmail.com> + 33 others); Thu, 14 Sep 2023 17:40:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjINVkz (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 14 Sep 2023 17:40:55 -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 2315E10C3 for <linux-kernel@vger.kernel.org>; Thu, 14 Sep 2023 14:40:51 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-59beb3a8291so17007907b3.1 for <linux-kernel@vger.kernel.org>; Thu, 14 Sep 2023 14:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694727650; x=1695332450; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=yg6NbhhS6bNBw/im5wDGZLYsqmgcXnTvleG//pORS78=; b=0aVZQDcPxW9vqBUD5lokonAdN0omVw+fVFqi1FwSebHZ9fv9DT4cN0DrlwPZbsWqP+ 8N58N/u8KPo/w/ixO2UKpiw/80Yeh69t2zbBinK8YsbZHeM49GesrttM5d8WMuOxz33m eD+3PkxmcIvipq2dznue6VcQq4/C1/IHltWYaNTy3d/DbtUcVkgsXn9ArGuiJGq3Zg3j sFZrSlLCyvOLzJdPVNOsfebYE8tyBgRfym9YwYNfiLQx10mdU0AF1tmvyopUPJHIL7Pc 5lt8lOO/CdqRjKmTUl6Uo46LVMg0noF1R6B3+hY8UCyZq1wQHfyf+53JmwEGZoNzHFWQ wdJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694727650; x=1695332450; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=yg6NbhhS6bNBw/im5wDGZLYsqmgcXnTvleG//pORS78=; b=R6Y2bSGQIL6tPefeoh4bOrS5s2ejttk2KSVOKmX4UJ9hGKnaoKuJJnCXPD8WDuzfdM e/FCP+13NfPQmNLOut9gGB5bXrccwSn3bm5ffhGoEK+lVzs0xw9JSowfdTxe3z7pYg/O jmj37/818aqVrprnqHvnBxuAncjLXtzPx2YleE1AnPtrcSEok8t0zbEzE9C5AItvDinJ p4Tpz/3iB70Iqao163Lo7t6R+BPhEOshPvzjnEEKyUcM5LxAmVidTv5gMfhx20eWY4Xb 6l5XLKATvwNGhpIiCwUyLl9wvYOHYz8j444RGYdw5JLZm7oPyrzOrpOVonE4QHNue3le iXrA== X-Gm-Message-State: AOJu0Yzliip+13P93L8EQWMjoId0dw21JQu+n80AM4aejW2e7JHb6pAi thbRpGYdCl+D90XDnLptgTKRVa7mOz6hGpDtXA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:690c:d8f:b0:59b:ea96:887f with SMTP id da15-20020a05690c0d8f00b0059bea96887fmr125429ywb.0.1694727650404; Thu, 14 Sep 2023 14:40:50 -0700 (PDT) Date: Thu, 14 Sep 2023 21:40:49 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAOF9A2UC/x2Nyw6CMBAAf4Xs2U1oSwL4K8ZDLQtuTB/Z2ioh/ LuNt5nLzAGZhCnDtTtAqHLmGJqoSwfuacNGyEtz0L02/awGzG8JLu24CFeSjFsqjT2GWCrZgqG +PLoohCuL/9gGDsdZaW0mMz1GDS2dhFb+/re3+3n+AGeHtrSGAAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1694727649; l=1779; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=veRS+F8fLCXOEB+IwiJ2Jr1EVTbkT3rdWvzzy6w4YBI=; b=mxTJZ6DGijn6/IfaObu6+S9iqoBOFL/VXV+IETu4YWEw2MiDJWtx0Af8fFwoaDQuBhONmsZIu cVfnCIxjq5WDEKO2xTXXXVEW93KmK0oIwx+SXuNXj091829J4/96aii X-Mailer: b4 0.12.3 Message-ID: <20230914-strncpy-drivers-gpu-drm-nouveau-nvkm-core-firmware-c-v1-1-3aeae46c032f@google.com> Subject: [PATCH] drm/nouveau/core: refactor deprecated strncpy From: Justin Stitt <justinstitt@google.com> To: Ben Skeggs <bskeggs@redhat.com>, Karol Herbst <kherbst@redhat.com>, Lyude Paul <lyude@redhat.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt <justinstitt@google.com> Content-Type: text/plain; charset="utf-8" Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 14 Sep 2023 14:41:16 -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 fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777076962541491195 X-GMAIL-MSGID: 1777076962541491195 |
Series |
drm/nouveau/core: refactor deprecated strncpy
|
|
Commit Message
Justin Stitt
Sept. 14, 2023, 9:40 p.m. UTC
`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 without unnecessarily NUL-padding.
There is likely no bug in the current implementation due to the safeguard:
| cname[sizeof(cname) - 1] = '\0';
... however we can provide simpler and easier to understand code using
the newer (and recommended) `strscpy` api.
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
Signed-off-by: Justin Stitt <justinstitt@google.com>
---
drivers/gpu/drm/nouveau/nvkm/core/firmware.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec
change-id: 20230914-strncpy-drivers-gpu-drm-nouveau-nvkm-core-firmware-c-791223838b72
Best regards,
--
Justin Stitt <justinstitt@google.com>
Comments
On Thu, Sep 14, 2023 at 09:40:49PM +0000, Justin Stitt wrote: > `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 without unnecessarily NUL-padding. > > There is likely no bug in the current implementation due to the safeguard: > | cname[sizeof(cname) - 1] = '\0'; > ... however we can provide simpler and easier to understand code using > the newer (and recommended) `strscpy` api. > > 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 > Signed-off-by: Justin Stitt <justinstitt@google.com> > --- > drivers/gpu/drm/nouveau/nvkm/core/firmware.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nvkm/core/firmware.c b/drivers/gpu/drm/nouveau/nvkm/core/firmware.c > index 91fb494d4009..374212da9e95 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/core/firmware.c > +++ b/drivers/gpu/drm/nouveau/nvkm/core/firmware.c > @@ -79,8 +79,7 @@ nvkm_firmware_get(const struct nvkm_subdev *subdev, const char *fwname, int ver, > int i; > > /* Convert device name to lowercase */ > - strncpy(cname, device->chip->name, sizeof(cname)); > - cname[sizeof(cname) - 1] = '\0'; > + strscpy(cname, device->chip->name, sizeof(cname)); > i = strlen(cname); > while (i) { > --i; Yup, consumed by strlen() and snprintf(). Looks like a standard conversion. :) Reviewed-by: Kees Cook <keescook@chromium.org> -Kees > > --- > base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec > change-id: 20230914-strncpy-drivers-gpu-drm-nouveau-nvkm-core-firmware-c-791223838b72 > > Best regards, > -- > Justin Stitt <justinstitt@google.com> >
Eek, I didn't realize how many instances of this we had. Thanks for doing this :) Reviewed-by: Lyude Paul <lyude@redhat.com> On Thu, 2023-09-14 at 21:40 +0000, Justin Stitt wrote: > `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 without unnecessarily NUL-padding. > > There is likely no bug in the current implementation due to the safeguard: > > cname[sizeof(cname) - 1] = '\0'; > ... however we can provide simpler and easier to understand code using > the newer (and recommended) `strscpy` api. > > 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 > Signed-off-by: Justin Stitt <justinstitt@google.com> > --- > drivers/gpu/drm/nouveau/nvkm/core/firmware.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nvkm/core/firmware.c b/drivers/gpu/drm/nouveau/nvkm/core/firmware.c > index 91fb494d4009..374212da9e95 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/core/firmware.c > +++ b/drivers/gpu/drm/nouveau/nvkm/core/firmware.c > @@ -79,8 +79,7 @@ nvkm_firmware_get(const struct nvkm_subdev *subdev, const char *fwname, int ver, > int i; > > /* Convert device name to lowercase */ > - strncpy(cname, device->chip->name, sizeof(cname)); > - cname[sizeof(cname) - 1] = '\0'; > + strscpy(cname, device->chip->name, sizeof(cname)); > i = strlen(cname); > while (i) { > --i; > > --- > base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec > change-id: 20230914-strncpy-drivers-gpu-drm-nouveau-nvkm-core-firmware-c-791223838b72 > > Best regards, > -- > Justin Stitt <justinstitt@google.com> >
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/firmware.c b/drivers/gpu/drm/nouveau/nvkm/core/firmware.c index 91fb494d4009..374212da9e95 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/firmware.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/firmware.c @@ -79,8 +79,7 @@ nvkm_firmware_get(const struct nvkm_subdev *subdev, const char *fwname, int ver, int i; /* Convert device name to lowercase */ - strncpy(cname, device->chip->name, sizeof(cname)); - cname[sizeof(cname) - 1] = '\0'; + strscpy(cname, device->chip->name, sizeof(cname)); i = strlen(cname); while (i) { --i;