From patchwork Thu Sep 14 22:17:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 140010 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp757356vqi; Thu, 14 Sep 2023 19:29:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1RYCpOaXAh/QDy5BJGDiF86qUJ1/+2A/IKGSMD2Cu54vUVTMuA5hDX3xa9BdRpjP+iggR X-Received: by 2002:a05:6871:79c:b0:1d4:de5e:9b8b with SMTP id o28-20020a056871079c00b001d4de5e9b8bmr485674oap.51.1694744944124; Thu, 14 Sep 2023 19:29:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694744944; cv=none; d=google.com; s=arc-20160816; b=UmJ/MVayvJkxyJkkuhAEFKIqPtdpPEheytmrrQ12mN8zmZkAqCesHHQX3QlyysN4Up dKkU7ZMjb3x/th/aOx2IOLS8CS5QfVocB3nWZ/pFWrTqIPsGknuG4dROWKQJqepsHg9v qymx6zNC2AzR8MVc1Kc38SVomj5DelWiGUE6BCBtOVgZ7N9RExn7MTb+uAfEpSHhTey4 NJ2fYpobhp/vWrlHrxw1niVnKCsNfFRkejFPdi0WzklyUESyqlUIC2lK5flXvG6PkrLM V0oWQh6ZFRRmxVLhyfw1teEWYhMr1GGtNsXmtkmmsOVFjKziZoTQ1W75p1PEfcFq43G9 7SOA== 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=NmiSL1hPoXorfA2q6qNOq7ioFso4QUSjYQj36GecrTE=; fh=TMnX3hdDehmouwKzg+0Re2/fuE6OgICJ/TdSGa29jbM=; b=TuBqUrDAQOvjQot3xAxRGPshsZq3PGusUdGQVzRD0pz7G1REiKa0t4eBjyYUmaCOhl em/Zx/U5s0MtGnxoyi7c4OvG4OzRi9YK01GB5wT5rZX/pDaLB0tbHUwKC9wtFfME1yY9 7gX7/tekqfPsSbfPgbR8I6YrZpnkg4LhRGO3oacpoaan683PEUcPS6Js9v4fXmFWxDdW 7XRRgcOQVx5ETF3el9m9xJsjPQTpm+A/WXGIp6zjLd/7nIbiHxD57l4PxYAl16Otu2DZ e+rVkP6QqnNE3m67gdKHaxvxWFbY67dmB/BDRo/jGIOKwVynnYP7Q8Bw3gKSiSLH/MJ0 DmmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=xkngvD2I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id w63-20020a636242000000b0054fe4cdd1a7si2446459pgb.716.2023.09.14.19.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 19:29:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=xkngvD2I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id D2E7E822CE1B; Thu, 14 Sep 2023 15:17:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230108AbjINWRX (ORCPT + 33 others); Thu, 14 Sep 2023 18:17:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230123AbjINWRO (ORCPT ); Thu, 14 Sep 2023 18:17:14 -0400 Received: from mail-oa1-x4a.google.com (mail-oa1-x4a.google.com [IPv6:2001:4860:4864:20::4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36EB12720 for ; Thu, 14 Sep 2023 15:17:10 -0700 (PDT) Received: by mail-oa1-x4a.google.com with SMTP id 586e51a60fabf-1bf00f8cf77so2111197fac.0 for ; Thu, 14 Sep 2023 15:17:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694729829; x=1695334629; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=NmiSL1hPoXorfA2q6qNOq7ioFso4QUSjYQj36GecrTE=; b=xkngvD2Ibfn8w03jxth/IdNDuHUov2S9wEE3mKAgK6Q1mChzRVyw499SXq0AUo289Y +JKqJd5TxrL2PO0QKNR23nWlvl+MrmwriQSqIDEvCUnQd7Uo1p0lI6XDj9OYqGoIkXck J52jeUoyaC9rVgZDVdETfWrEwEszVZ7TSIDG2h37hl9k13Tq+YmW9EiDJUA51/nf10WK BZVMls7AVpXNkoY3o0KpqXGp6n2kd1H6koJZTJ4EMOE2GfZ8txQDffzrlTUlK6yqOwur qV+YJoBcWV7/tAxy6NAzSig4O+Rx095bL6zYNVPjmsp0kcIPm3buw0KK2lkdTG32viMt KB+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694729829; x=1695334629; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=NmiSL1hPoXorfA2q6qNOq7ioFso4QUSjYQj36GecrTE=; b=U/kESbmecpBxT9QWOsdzhGkrnQU6k3hg5D3+9YkFDEDGHsn5hUFVmFWluaBpKWJ1jy 93vZWiduuBGdGNOIhG51Qv/tkdqH2LyBIEaLw4BQrq72SDlZuseWw1oCkzfPeBjWcVru 5uNt/KMDIizwKrZMhiGM3eFeaht/FAbsii1K9JD+FLyYa8QRHt4brRb5WP1+0XTajqlz viEVEZh3OF//5V3p1WbAsRBCUSNBkoy1HsXZEROEWddZxDF0zWxG8A09RYqyk0ZakcuL FDtNOZzSJPsOzS0T/LRfUjwOhyREB8eTNRpyhtRtq+7+UXZoHLhommDTAH2Qn8BJX0Zx zClw== X-Gm-Message-State: AOJu0YzI+comCUVerUziMYny8qq9zaX/W/DC/jdStUvDioWxC4VuuP/m KJiREBIvff+Hy7PUvhpvsoOgLHqtYwUc7QT/oA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6870:5b17:b0:1d6:6175:e8b7 with SMTP id ds23-20020a0568705b1700b001d66175e8b7mr704oab.4.1694729829605; Thu, 14 Sep 2023 15:17:09 -0700 (PDT) Date: Thu, 14 Sep 2023 22:17:08 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAGOGA2UC/x2NQQqDMBAAvyI5dyFqodqvlB6SuEmXkjXsamgR/ 97Q28xl5jCKQqjm3h1GsJLSyk36S2fCy3FCoKW5Geww2rm/gm7CoXxhEaooCqnsjTPwuld0O3B 9Z0BOxAglg3eKEGCcfJzDbfLBRtPaRTDS5/99PM/zB65MP5KHAAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1694729828; l=2319; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=RxOj2KRPJoHaPbd44NSfvp7xlYOfBBUfmUGMt4NplWM=; b=DjqYwwhRW21CQ5QMz9Kq/kMZK/2XQMBC1ojIhEn54/lvBB1ZMdiXQOPyCP7EYWc+wzaWYIxZw urNwQ6OfNmeAjWVrv9S1uYW4YBYQvugcZXBlGnwgHVmMTJgXi8klaNc X-Mailer: b4 0.12.3 Message-ID: <20230914-strncpy-drivers-gpu-drm-nouveau-nvkm-engine-pm-base-c-v1-1-4b09ed453f84@google.com> Subject: [PATCH] drm/nouveau/pm: refactor deprecated strncpy From: Justin Stitt To: Ben Skeggs , Karol Herbst , Lyude Paul , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, 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 (snail.vger.email [0.0.0.0]); Thu, 14 Sep 2023 15:17:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777068874472724586 X-GMAIL-MSGID: 1777068874472724586 `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. 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 Reviewed-by: Kees Cook Reviewed-by: Lyude Paul Reviewed-by: Lyude Paul --- drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec change-id: 20230914-strncpy-drivers-gpu-drm-nouveau-nvkm-engine-pm-base-c-38bf9c78bc0f Best regards, -- Justin Stitt diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index 8fe0444f761e..131db2645f84 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -462,7 +462,7 @@ nvkm_perfmon_mthd_query_domain(struct nvkm_perfmon *perfmon, args->v0.id = di; args->v0.signal_nr = nvkm_perfdom_count_perfsig(dom); - strncpy(args->v0.name, dom->name, sizeof(args->v0.name) - 1); + strscpy(args->v0.name, dom->name, sizeof(args->v0.name)); /* Currently only global counters (PCOUNTER) are implemented * but this will be different for local counters (MP). */ @@ -513,8 +513,7 @@ nvkm_perfmon_mthd_query_signal(struct nvkm_perfmon *perfmon, snprintf(args->v0.name, sizeof(args->v0.name), "/%s/%02x", dom->name, si); } else { - strncpy(args->v0.name, sig->name, - sizeof(args->v0.name) - 1); + strscpy(args->v0.name, sig->name, sizeof(args->v0.name)); } args->v0.signal = si; @@ -572,7 +571,7 @@ nvkm_perfmon_mthd_query_source(struct nvkm_perfmon *perfmon, args->v0.source = sig->source[si]; args->v0.mask = src->mask; - strncpy(args->v0.name, src->name, sizeof(args->v0.name) - 1); + strscpy(args->v0.name, src->name, sizeof(args->v0.name)); } if (++si < source_nr) {