From patchwork Thu Sep 14 23:10:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 140267 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp903729vqi; Fri, 15 Sep 2023 02:01:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFxuLw+7u6qEFwzLIitGmTWsH1JjDOMtcB/XjyJRLD6ktuCa7ka0dUqDJ7X8S/v+iAtU8Jw X-Received: by 2002:a17:903:2281:b0:1bf:193a:70b6 with SMTP id b1-20020a170903228100b001bf193a70b6mr1572676plh.5.1694768497479; Fri, 15 Sep 2023 02:01:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694768497; cv=none; d=google.com; s=arc-20160816; b=Fv4fLuGyzo26htOiR2sg/7GJduhH2RZvBfwYlk2/6YMtoc4URNi/1GnpftKEKpeFKH BoWGv40dpWZ/RobmqOIRjO65y1fSSX5+xhjk2ofUIZKmpUlKOXvdTUK7xjASe1dWUw7q lmBvjEUa+FCHRmFW3PQNjmJwzkW223DOKID/clqLEMiVRCibnm2ne0xNj0zLw9Jjv1P1 exmy5cRmUmbbfTWCdeWYAJJRCcYAszBIKiFU+/TLs+WgtiCRPAcrkF5Rsf/Ax84DR4FO 818kdwSIvbpXU6o0gBn9Q0OKnW3jR+Pxvj42UFnapNzFW9lzXUjH8+RKXa004DIJYqA5 GwSQ== 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=KF0ypLEqc8BBDWzXbz6oiYZjtdi3CP4D2nc6vcNdwQ8=; fh=ijdLXb6B7B2+Vh4vAr5Wxdp5rQTFwGIQxCck1HcyXYc=; b=gyC3toz56Dsjy7ZBZAoFl9j/qDwZ8HWxW7LEOPTMJl4pGtRRpczOQyiZJz1JE2c7CL 5zEaQto50hyp4LN5v9yY0cbZeEM/XWIm7HksMdm+8tH7oUyw0P+f1S7ieUhKInu/4pfu J2KKe/UbkI2OZdYrfq7o5Jkzpy3wKdyIGC1TpXiaauHIt8TIIHO3VDUJXKtId59ez68s RgVvz6DZTTQBBWq85zBufzFPnlfEQizsuUvV2rrJJEmNLhJkq2+AKPkEhfiCj9O0nvAV YKEQPtRKj+8lY4wdS06Rng4HKfFZNmNVHZ0cDmFYYtfBPtDQqAozLt+OcHIVHTa6TAYZ QSNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=dcm6mUs6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id q15-20020a17090311cf00b001bc8a9f5e52si3183255plh.135.2023.09.15.02.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 02:01:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=dcm6mUs6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 694E683D992D; Thu, 14 Sep 2023 16:10:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230167AbjINXKl (ORCPT + 33 others); Thu, 14 Sep 2023 19:10:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230086AbjINXKk (ORCPT ); Thu, 14 Sep 2023 19:10:40 -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 E47382707 for ; Thu, 14 Sep 2023 16:10:35 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d81486a0382so1693476276.0 for ; Thu, 14 Sep 2023 16:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694733035; x=1695337835; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=KF0ypLEqc8BBDWzXbz6oiYZjtdi3CP4D2nc6vcNdwQ8=; b=dcm6mUs6NrlRr3+Bv4MU/6hRlV8JryV0LkFeM1Rs87sn8Y2hKrFJH9CBA3ZYg6rEUD qotPg+8AlWD4BihnV0IeVn/O0sWC0oxVgqBV4ekk6Bzmzm2sDZcR2AgQK+xCjswEcEZy T75X+lKpFPb5PZQtmkx43qdHMBMcauFmJa8ae3znI1T8xk2IMvOEajy+bVL5DlT3ILhx htKAqPXAcQg/+bAdrySOK2/MRvzieRTxrAiieZIi6qXaOd3rQHX9qJdItganmcF8SDAS 8iTPDSmgUGWVKOLNDMFTmhtwVzj4NT2mkVRriapokM5smLE69wGvGYgSg58bo+/ePLqh w+0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694733035; x=1695337835; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KF0ypLEqc8BBDWzXbz6oiYZjtdi3CP4D2nc6vcNdwQ8=; b=WWBD6Olud/TUAyGinSg1f5Ht1PBXQEYcqf/9UMNxiHZ13jx/JQ2rgWjaKz5Ww9TOKi eLkV8JP6mMB8xWFOg/D52N5AK3ZUl4b2HIuJvPfAnHiX+s38rVEhiM6SjBYudjIPtqAg h2u1cM4egFJiDj8Y3dy5wegHapjgUVWy1h7axmKH0dZ1DubsFsiC3vZtQeChurscB+xK C7ozw+ZicHG2zmYAlol5aD7jhHVGsavqRbwq66jj6daT0ElHwo/IkB3b52GlvVvtPHXn L8O9r8D8yHeqG2XZGzZgxUhAgydbXjpJelJBU2J8hbEUTXQQ+6GZHr8Fy49AZHpyiNFx YicA== X-Gm-Message-State: AOJu0YxnnlTOrhxAVS3x67oANIOmv12LfuRixYLsk4OjQNvMBVVuzDXQ /ChKH8b5BF9KB1qZdC41HHgLpktSKg/S9ixdvw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6902:684:b0:d81:8e4d:b681 with SMTP id i4-20020a056902068400b00d818e4db681mr80330ybt.12.1694733035150; Thu, 14 Sep 2023 16:10:35 -0700 (PDT) Date: Thu, 14 Sep 2023 23:10:34 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAOmSA2UC/x2NQQqDMBAAvyJ77kJiQ4v9SikSkm3dgxvZrVoR/ 27oceYws4ORMhk8mh2UFjYuUsFfGkhDlA8h58rQuvbqOh/Qvipp2jArL6SGwzoWwWiz9evIvZF YqToheUeuCzHc7hlqblJ68++/er6O4wQmV5npegAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1694733034; l=1557; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=1iP5Kt48YlJbVGCF4UiawrlrXPZCOJ+oBhMz4zjhzn8=; b=STd1ZyVgYq02tF3XVQ/Irb/McEXI8g01pYBzaUJmsnLEJJxLiij7ySF3piV/6RfuxFPDTD0hi 6RSnhuI3LY9A89UlMBC96MAOPsGwzwiEx7mkwcGty1+A9V8bdZgr5gx X-Mailer: b4 0.12.3 Message-ID: <20230914-strncpy-drivers-hwmon-asus_wmi_sensors-c-v1-1-e1703cf91693@google.com> Subject: [PATCH] hwmon: (asus_wmi_sensors) refactor deprecated strncpy From: Justin Stitt To: Ed Brindley , Denis Pauk , 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 (pete.vger.email [0.0.0.0]); Thu, 14 Sep 2023 16:10:48 -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 pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777085391213831759 X-GMAIL-MSGID: 1777093571869150395 `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. If, for any reason, NUL-padding is needed let's opt for `strscpy_pad`. 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/asus_wmi_sensors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 3669558bdf354cd352be955ef2764cde6a9bf5ec change-id: 20230914-strncpy-drivers-hwmon-asus_wmi_sensors-c-e10e094a467d Best regards, -- Justin Stitt diff --git a/drivers/hwmon/asus_wmi_sensors.c b/drivers/hwmon/asus_wmi_sensors.c index 6e8a908171f0..c2dd7ff882f2 100644 --- a/drivers/hwmon/asus_wmi_sensors.c +++ b/drivers/hwmon/asus_wmi_sensors.c @@ -300,7 +300,7 @@ static int asus_wmi_sensor_info(int index, struct asus_wmi_sensor_info *s) goto out_free_obj; } - strncpy(s->name, name_obj.string.pointer, sizeof(s->name) - 1); + strscpy(s->name, name_obj.string.pointer, sizeof(s->name)); data_type_obj = obj->package.elements[1]; if (data_type_obj.type != ACPI_TYPE_INTEGER) {