From patchwork Tue Sep 26 06:59: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: 144827 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1839020vqu; Tue, 26 Sep 2023 04:30:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAMvntwVqK6DlW+WW2ZAtk2mSzQRn1K7jxFYCytXcZNHdi5UxHUPUrN16BmNM728YnXRnf X-Received: by 2002:a05:6358:5e17:b0:143:e3a:de5f with SMTP id q23-20020a0563585e1700b001430e3ade5fmr5519589rwn.26.1695727806580; Tue, 26 Sep 2023 04:30:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695727806; cv=none; d=google.com; s=arc-20160816; b=Ai9YmZW+3rJ7b/Ep9I+AJAu6C59O2UQhQZ5FAbfs5cJNN4XlMzCxRdM0WDQpbrwKvr IOUJqt3DcxmKAVf+r7/8OQ5lbqyt/JeuCK+9cGC+o2+5KK0WrSTupLdKvDbOY60g64dW dAhrgGx54YTOZOf2M9UVeGDeEPD1+CImp9t4eGlsfUrfbyilfmJnrc9IpA+b8Zd4zb+d KhriuwzPpDilbK1LaBQLOLskaqMzMXbrKDdsc+yTrpLxfWcYcY4sS5V8dySrAEZwbzvt +MD05YoTyjHp8KHpOwVCH2k3j7ieB9yeVQ4VLl53Wf1KhZmtzA2PnB+mmSdgMveUnsBO 4Q1g== 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=U+nMD7o5PWsEvgu0yQwljZkcod7HvATgSWdAFYmTAx4=; fh=zh6kXPTz1XwJ71ooIjTN2elWKdE55XDb6+mZ3G6VlXY=; b=ZMJuqAFrg1x2I6ckVEtYEGdLjlM5nELdA7loVFSb2TyDirFyuJuNmy9+dotz3eeRQY 6wbbaigYb6Q0p3tq/wOfRML+Nd1ddwsSUKd0YPzVYYG6+mVcMZVyYXNI5MyaQ9vrXiiV wETFTPeSmFXB5kUiW++PhSf25pxVif8j2HE9ixMGSTxG9fIpcayexKmS0v+NyJnVnCEz KqE19ZQ8epWyd7+D5UYqI235tbVo8JNqcGUK75WG/WGACYhmNC9R4svAIPZNy/yEb4hb AYoadiI2nothJfNN/ilwdM4TB+rKiKzE5zDg8H1V+RFrjpC5/WCVj7tAmntGi0pX5kV/ gndQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=JMJ36ped; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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. [23.128.96.34]) by mx.google.com with ESMTPS id q17-20020a637511000000b005779c97fae5si12184774pgc.480.2023.09.26.04.30.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 04:30:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=JMJ36ped; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 430768097790; Mon, 25 Sep 2023 23:59:32 -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 S231478AbjIZG7d (ORCPT + 27 others); Tue, 26 Sep 2023 02:59:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229585AbjIZG7b (ORCPT ); Tue, 26 Sep 2023 02:59:31 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE7ACFC for ; Mon, 25 Sep 2023 23:59:23 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d86a3574662so10345864276.0 for ; Mon, 25 Sep 2023 23:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695711563; x=1696316363; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=U+nMD7o5PWsEvgu0yQwljZkcod7HvATgSWdAFYmTAx4=; b=JMJ36pedV06u4rIIxWngWv74moobNEuXt8LlDgdwhp1Hz2Q23iUE87uLKVBEf3CCpb PfnBhGYMTwArCgAvtO9VfFeMWlDsOEaIobG1UiXPVhDGAtk6niBlUKf9pKVYgQfLYT39 BbCERnf1t38hXvRWzP2ox3Wdo0B8UWBTIEGqzUlSujnBpjZKmNVfnrzydJFPwAJrGT+v xwnc2fKRkgbltEVO4FoxQZvgbQSNbyjD7VmBDQUL8O6IGvyWFvOV9JF95C1KaGGrgP7E CpPpz4C9428xj+8h68yh5yShNKqfUZMXXy1Qs1KJ2zc0mzWRTFEpYEVdRQF4bCfZ93oh JBUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695711563; x=1696316363; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=U+nMD7o5PWsEvgu0yQwljZkcod7HvATgSWdAFYmTAx4=; b=i4Bz7ETHM/G1GvkI/SyN1z1DxpuFQ+LejQTlma8Sdde4mYVq867BkkTgDwVuKveyo4 YIRQT14hQkelIG4xvxXoEgLCCEf9JRpHLbpFOsmEoPY8zr9WASSxfzi65ppdT2jAh966 a6cUaGDJvQbsHbH0bGb0W0KbFVWPdHETyVEzKJBxSAQKRFor0k3nBj99fmY8dG4QDWWi KTZMNSoerD0Z0njcl5ZirmgSUmZgjpDR/qUyAAImbAlL0jjuQxvvzM38wn1/i+9OvAuq bHXgXUjS8/lmrsgJplQSQjd9lUSdow7WFRrM1NChYHvoKsZ46SsHvgyTm7QYOEV/TKnu bfiw== X-Gm-Message-State: AOJu0YySNf9xdkR4M/AHZiqXRdKx9RuBdYuGQ6EkQ1pTQXsHEM87X7Ej /bKsLqdgsspPVj4WwtbKMRXQrWHsHnCfv0wvOQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6902:1085:b0:d7b:b648:f0da with SMTP id v5-20020a056902108500b00d7bb648f0damr32014ybu.6.1695711562907; Mon, 25 Sep 2023 23:59:22 -0700 (PDT) Date: Tue, 26 Sep 2023 06:59:15 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAEKBEmUC/53NQW7DIBCF4atErDsVDBCbrHqPKoocPNhItbHAI oki3704K1dZucv3Ft//ZImip8ROhyeLlH3yYSxDfxyY7ZuxI/Bt2Qw5Sm6EgjTH0U4PaKPPFBP 0tyGM0NjJX6Zwo3gZaKYIFqxx2NZcyys5VrgpkvP3V+r7XHbv0xzi41XOYn3/EckCBBiu0VSqM o7qry6E7oc+bRjYWsm4lc0OGYtcS1Urie1RKXyT5UZGsUOWRZa80hrtkax0b7LaynqHrFb52th KS+UE/ysvy/ILL0f0+e8BAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1695711561; l=2263; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=2U9Nj4BmlrBIbcimiE1QZuM/UADBB5VoZJZ4/Ueo3o4=; b=PJIyqZcfUPI3uGAZNaGrFzr6nWv8+WcrrjFCp55EuwvjiG33+XJ3P9t8fs6cCaCoeyXmpwQC+ Z8S44VtvCGkDKT0oXjksgmxMWD55HBnSW2VEKzzHia5zdb8jK2RQTK3 X-Mailer: b4 0.12.3 Message-ID: <20230926-strncpy-drivers-hwmon-acpi_power_meter-c-v5-1-3fc31a9daf99@google.com> Subject: [PATCH v5] 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_NONE, 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 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]); Mon, 25 Sep 2023 23:59:32 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778099480836225897 X-GMAIL-MSGID: 1778099480836225897 `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 Reviewed-by: Kees Cook --- Changes in v5: - fix indentation (thanks Kees) - Link to v4: https://lore.kernel.org/r/20230925-strncpy-drivers-hwmon-acpi_power_meter-c-v4-1-3bac7534f10f@google.com 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..8db740214ffd 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++; }