From patchwork Mon Sep 25 03:43:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 144199 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp978937vqu; Sun, 24 Sep 2023 21:47:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEXY2UBiDMydU3S5Ysgk+YPDh4Pom3fcNlUys8HM38VIUcbDL5py+lOAJRP3tcoxcxrMuKC X-Received: by 2002:a05:6358:931a:b0:140:e7af:44c9 with SMTP id x26-20020a056358931a00b00140e7af44c9mr7126225rwa.23.1695617256979; Sun, 24 Sep 2023 21:47:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695617256; cv=none; d=google.com; s=arc-20160816; b=JP/FpYFYPvgivuGeBzn9QgVabCp2MMnQMVrJ0gVDFN8TPsc3NukynCgxPcwed4Pgik DEEt4RBtNDlJDTK6BgWqFJA+cTLBYBsfZ7EbHGf7gubXMbEV1K6qNSyrpJxjyumHvU9s vMUBpZAuOumsfv7wBx99EBcHVyaLsAcLN4DxU/bzZhHdo5PzB31BlAGlO9dIQW8SG+ey 34jKzibpRESTJLxV/AkACJAuRt/uG8aUkTMDyEP+q2cqH8oJ6rnBiSUvPpzj6S1klpl1 IPHOVGnfcF/cpJG2tota1nPmsGeGrBs/YevdiDgxLtrfpbuRQoBvAmzouUAoKYBuFF8q xqng== 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=kGi+l4riuiaECjqmxxM9T013wn7H2VmKYNQkmtyxbEM=; fh=zh6kXPTz1XwJ71ooIjTN2elWKdE55XDb6+mZ3G6VlXY=; b=KBxQL9QkzXKddFyx2Oy/l1uhLuPiYY0CVL+v8/YlS7omb7SaW2zYsU4egyvwTWuZm6 2OQDjqCqgNDJegF3DARDKOy9XMDM4YdPzAFckXmNj746f2tAY8nJwpkgbgcs6vr+Pw3F pr98fzO9Ak/v4EjDMJEfZvfhumvOTDDNXOYuz/lnh4G3GOSkqIhkw06i/6BYp4quowE9 DWs3K3ZvZbJmbflV5XFcpKvbpvY5A2IGpR/mtwxOjOGa1TwOQpZlODlwcky37+wKorFv rlStwKoY6kuZD2dg4YN6XRlnnW6Pcg371FVKuYff58Q9XISWqtlFJ9vlsBqLyvXlYH82 KtFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=fJC5qr8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id m1-20020a656a01000000b00577f9fa06e3si10146677pgu.706.2023.09.24.21.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 21:47:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=fJC5qr8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 6D0FD801E135; Sun, 24 Sep 2023 20:43:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229732AbjIYDnf (ORCPT + 30 others); Sun, 24 Sep 2023 23:43:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbjIYDnb (ORCPT ); Sun, 24 Sep 2023 23:43:31 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DB04C5 for ; Sun, 24 Sep 2023 20:43:25 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d814634fe4bso8497281276.1 for ; Sun, 24 Sep 2023 20:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695613404; x=1696218204; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=kGi+l4riuiaECjqmxxM9T013wn7H2VmKYNQkmtyxbEM=; b=fJC5qr8gg57/YeN024dGxE569nrPQ7n7Ms7eT+oerUUINbPVOFDA+JdoOzRv4WkVhd UpajUvo2i8wDGjuBdiyKPPMbFc2ZTqdHIti2kmRE3XglI+x436aTA528ItrdB1CsGWqG R5i//U/uAvW7T/EwiAT8+TciTyicA02YT6BJ1qlJ770XUZT5H2sN1Hg68lEHZzqf1s3J YIHbnTx87ZBvqCm52BOPE9cvwS3VbUlbkWrVklaJeQozxvKt0JTZQNx90cutgN126vS0 jzBH7QZfQBRIn7nggv5MgqLeju2k7VpIN5BebkrlU0Cln4PdH3EAh6Y3Xp9disVKr3Ta CiOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695613404; x=1696218204; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=kGi+l4riuiaECjqmxxM9T013wn7H2VmKYNQkmtyxbEM=; b=HGBnyD0MzMOx1/CaAz09wVUsN8KmrKjnsAiPSoMQ7jPWqDbs2Dg5KkUQ+bro8sNEGV nE4z0pfqv5JfTUsuvrHgI6Tz+F1XBej0qM2qZcM0KbKOylre4LrQ98FJlFOQcFQPreID BVmMObLSn6s6a4JLyGAcLQ+LS6IqLlpQhCq4VZndo2tMyKxFKSs/bJ9fVh6bRkac6lbj GYeKw/ROwNJhQHoaMRFUfhKXA60s5k2zminikMzKqUFji3DoZDdIzMNnCIEKuspXdvsB g7mzAAk549DaQVRYrW0+TH/7ObxmP2Hh6+9gYmmLs4jOTGrVPZSwdUfuKfWqCiG8XQWQ Wuhw== X-Gm-Message-State: AOJu0Yx87s++n4C7cQ9xphGa1WxzRwqsXTILbTswB5Cwaq0fZz0hNZkX PfHFxdF5p2oO/fRttIcvVAunaklh82fy3aCc+Q== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:5050:0:b0:d81:7617:a397 with SMTP id e77-20020a255050000000b00d817617a397mr54759ybb.9.1695613404635; Sun, 24 Sep 2023 20:43:24 -0700 (PDT) Date: Mon, 25 Sep 2023 03:43:23 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIANoBEWUC/53NQW7CMBCF4asgrzuVPXZIzKr3qBACZ5xYauJoH BmiKHfHsKLqii7fW3z/KhJxoCQOu1Uw5ZBCHMswHzvh+vPYEYS2bIEStbTKQJp5dNMCLYdMnKC /DnGEs5vCaYpX4tNAMzE4cNZj28hKX8iLwk1MPtyeqe9j2X1Ic+TlWc7q8f4jkhUosLJCW5vae mq+uhi7H/p0cRCPSsZX2b4hY5EbbRqjsd0bg39k/SKjekPWRdayrip0e3La/5K3bbsDahucXJU BAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695613403; l=2092; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=ioSkjFW6xO8Zk6Hy0g0yjtRiiK1nC4uSchEb5oNum5w=; b=fMjWVGvcSh9yNcffpjEcUdHXCUXqgO+uc1xT2SyEgz2oCVkPicvItUudYEWRwJTfU561WP+ua RdtVThBRACuA8mljVOy6FIl3jboq2056DJkW4IqXe500CvQqhMj6Crn X-Mailer: b4 0.12.3 Message-ID: <20230925-strncpy-drivers-hwmon-acpi_power_meter-c-v4-1-3bac7534f10f@google.com> Subject: [PATCH v4] hwmon: (acpi_power_meter) replace open-coded kmemdup_nul 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 X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (howler.vger.email [0.0.0.0]); Sun, 24 Sep 2023 20:43:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777983560301910979 X-GMAIL-MSGID: 1777983560301910979 `strncpy` is deprecated for use on NUL-terminated destination strings [1]. Let's refactor this kcalloc() + strncpy() into a kmemdup_nul() which has more obvious behavior and is less error prone. 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 Signed-off-by: Justin Stitt --- Changes in v4: - drop +1 from length arg (thanks Kees) - reword subject line (thanks Kees) - rebase onto 6465e260f4879080 - Link to v3: https://lore.kernel.org/r/20230921-strncpy-drivers-hwmon-acpi_power_meter-c-v3-1-307552c6ec3f@google.com Changes in v3: - refactor to use kmemdup_nul() (thanks Thomas and Kees) - change commit msg to reflect ^ - rebase onto 2cf0f71562387282 - Link to v2: https://lore.kernel.org/r/20230919-strncpy-drivers-hwmon-acpi_power_meter-c-v2-1-8348432d6442@google.com Changes in v2: - use memcpy over strscpy (thanks Kees) - Link to v1: https://lore.kernel.org/r/20230914-strncpy-drivers-hwmon-acpi_power_meter-c-v1-1-905297479fe8@google.com --- drivers/hwmon/acpi_power_meter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- base-commit: 6465e260f48790807eef06b583b38ca9789b6072 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..c13b5c8a0433 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -796,14 +796,13 @@ static int read_capabilities(struct acpi_power_meter_resource *resource) goto error; } - *str = kcalloc(element->string.length + 1, sizeof(u8), - GFP_KERNEL); + *str = kmemdup_nul(element->string.pointer, element->string.length, + GFP_KERNEL); if (!*str) { res = -ENOMEM; goto error; } - strncpy(*str, element->string.pointer, element->string.length); str++; }