From patchwork Thu Sep 14 22:50:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 140501 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:a55:b0:13f:353d:d1ed with SMTP id 21csp386411rwb; Fri, 15 Sep 2023 08:14:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsmkLf3i4eH3hqIvjrMTOAYUt53zznPhdWY5oFuhGmOcQnAY3xz5/n/HHVd71uFBB6Sxa9 X-Received: by 2002:a05:6a00:2d9d:b0:68a:6018:a66f with SMTP id fb29-20020a056a002d9d00b0068a6018a66fmr2569701pfb.2.1694790870442; Fri, 15 Sep 2023 08:14:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694790870; cv=none; d=google.com; s=arc-20160816; b=r2enoPfdyM7FPbCNfHgj0RJwvyfNv70iu0uZaRxRlO6bcWNn/b4xw+nW8fYVcz3sfI j2S3eXDu+lLnNP9ky10mHMJ/KtaFkd1w1xSZF7tZeVu50edTDn974TMLaChqLVAqT5rZ IUvoAtBvO8IIYpej6VHV2213l9maAYMGVfwpDfQTrnXWI+03mJtqTjYPnr6HXRa4A3bk J+0G440VV72n5grDTeOn2BAKmTyMbCwJN6XRYDMjAjLgvIg0mmzMrfCg2ydfTm6z7FM3 9V6mEm5fyCrrB3CcIa8TwZA7b+IqRBDwy2RwCmBRh5+MCqxron+wWFvQPUVGl5b/aglh OFyg== 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=wrenr5WHs2dK5hnlbbyL0EycRKjoEDbDNwq7CnxxIaU=; fh=zh6kXPTz1XwJ71ooIjTN2elWKdE55XDb6+mZ3G6VlXY=; b=StCA/rLNIbur0d634a9//C7sOJwLyZiqwvmPYWJlhCv7yFK3j8l0qMqE0SNwJ13wji g5MFfZkDk7BYjbyydywjSek6BXGPu5NBDFgudtvuOQsttGGuBbEmhvcRCos3eV5WrAAF k+F8kzjMOEHlCnFovkn3WeBqYTHm2HPiCeofF2QPxF8FEkpik7jPL1GG7D+y9cWHjhAc gsJUrT+C339tBlmGKMtaA5AOQm7HPP5m+XAr83P9g+vsrAfVyN9q0DY7kX5NYhQBY9dP 4W/ccrzskkPEQ3Helt75k8xuYKN60UwMwJtwciMVuerqX6ufJIrCIbMgYL7og3OruGOg 4GPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=BxugndSs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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. [23.128.96.37]) by mx.google.com with ESMTPS id ef6-20020a056a002c8600b0068a3c575900si3428535pfb.84.2023.09.15.08.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 08:14:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=BxugndSs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 6FDF68129AC9; Thu, 14 Sep 2023 15:50:25 -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 S230083AbjINWu0 (ORCPT + 33 others); Thu, 14 Sep 2023 18:50:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230116AbjINWuZ (ORCPT ); Thu, 14 Sep 2023 18:50:25 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 857D526B8 for ; Thu, 14 Sep 2023 15:50:21 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-59bdae1ef38so35558617b3.1 for ; Thu, 14 Sep 2023 15:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694731820; x=1695336620; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=wrenr5WHs2dK5hnlbbyL0EycRKjoEDbDNwq7CnxxIaU=; b=BxugndSsenTM9NF1aOCW4ZO/a1jXQgUDDQ9ubb3sKS1Ev0pBTHSqm//oPKCUZG33dn +IDUP66N300o9+XksnMg5cDPIFDFxkcsPwO2j+tzjfvqooIFtT61kpn2waKHY164Bgsg dFgkaZzbCbvTJsGmT2sQ79BXa4Ns1A/gSs1VZFHipi7fzgvaCLBeDxDKFjY4FY1EPqsy 3dEmTXoLOBlv6XJVimtn6xD6xix+mSWXcbD3goZCRcw0ftb6DoPrqdngHUk+j+NeqbsL rPFs63g3CQlzsY9Gx+TF9cQ+wqvv6x/G3jgAmhXDbhyiFrH3SbMi17bZxVurW/BLWAAS 81eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694731821; x=1695336621; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wrenr5WHs2dK5hnlbbyL0EycRKjoEDbDNwq7CnxxIaU=; b=Ta1lEZG2idAXxQuzTReqA6tzoHF/OHBQtTIUr/pQbX2EWRFLVgCqFg9X8Yc485akeO S08I6Mlz9YJgvMsA/7hMbWeIcxFpZvOgvm+v8MerI0hMKNTihNXh6AbTxRzmXsrp79fl PdWTWrrlZUfvkfAZ4EYwBCUFSQZM58ZjDfTZJSG604TgvvyGA9QasqOond0vgMoZkmNV XgD9dB6MXjuN4mUKa4vzUlgR7FZ5FFfjporGi9WBcX+eaSR7/dEWuUnMZgN2aoNrvbrH VfYOAr5KYoWQWvXusxRiEQAf1Bn2Mtt0fPKMuw81Y5jdg4KmQdl0mL4diHPNG4/g1ZdJ EFow== X-Gm-Message-State: AOJu0YxCGoyVZxpBIda1avbqZ38nWEgUwBm/Z0Ia4FM/8eA/pm2HrBTR yPzxHzGpBUlQYV3/oLJH94baei24AsBTbrcfwQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:c748:0:b0:d15:53b5:509f with SMTP id w69-20020a25c748000000b00d1553b5509fmr85146ybe.2.1694731820834; Thu, 14 Sep 2023 15:50:20 -0700 (PDT) Date: Thu, 14 Sep 2023 22:50:15 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIACaOA2UC/x3NwQqDMAyA4VeRnBeodYO5VxlDXJrOHGxLIuoQ3 31lx+/y/wcYq7DBozlAeRWTnCraSwM0jenDKKEavPOd69sr2qKJyheDyspqOG1zTjhSkaHkjXW YeWFFQuqjD3d3694coeaKcpT9v3q+zvMHDxSl8XoAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1694731820; l=1404; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=K3iZ/hNNCktU+LFT+e2eCRR8wtHujlZPGvgREL3k5N0=; b=AMgFe1H+bSBII/rO5u6ibPsdFEANAgzsVzlwm/0r26kBLn7wO36XET/m1sJz644C8oxgiiZ7R YlZOH5dfwGzCrRlgTODJ7YveNEm/+t8Y38//F6Nts1+INz+B7Gxxjzc X-Mailer: b4 0.12.3 Message-ID: <20230914-strncpy-drivers-hwmon-acpi_power_meter-c-v1-1-905297479fe8@google.com> Subject: [PATCH] hwmon: refactor deprecated strncpy From: Justin Stitt To: Jean Delvare , Guenter Roeck Cc: linux-hwmon@vger.kernel.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:50:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777117031683784296 X-GMAIL-MSGID: 1777117031683784296 `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 --- drivers/hwmon/acpi_power_meter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec change-id: 20230914-strncpy-drivers-hwmon-acpi_power_meter-c-c9f2d8053bef Best regards, -- Justin Stitt diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index fa28d447f0df..9bafe7c85ff7 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -803,7 +803,7 @@ static int read_capabilities(struct acpi_power_meter_resource *resource) goto error; } - strncpy(*str, element->string.pointer, element->string.length); + strscpy(*str, element->string.pointer, element->string.length); str++; }