From patchwork Fri Oct 20 19:21:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 156288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp1277033vqb; Fri, 20 Oct 2023 12:22:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHHewR6/uJe2naecR/6vXjKDHn6ZQUnYqJfx2YgFWFMDygN8oFp7Gv5c8KHXB+uZbBfIbUk X-Received: by 2002:a05:6a00:24c6:b0:690:1c1b:aefd with SMTP id d6-20020a056a0024c600b006901c1baefdmr2893134pfv.5.1697829765162; Fri, 20 Oct 2023 12:22:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697829765; cv=none; d=google.com; s=arc-20160816; b=M5FmLNXV1WKY7wj4Bhm2vhRQ/TU0EBIFd0E35L77v3b7FikTVc4A9iOngdUvMepdwQ Z40fAfO+ojwRAraNkonL92ERAO5nj73Q8mNWJI8z0pVmg+H24I3MMU6OSiVC2XrLX/fc CUWaqtswxeWyrCxaaGWHCpE5hSHkZn4LFoSVc2nreiEHv6/6/sOTAbCBVjP1WP16x4xO OyQK1AFt3lzrghEftHr4xDhRenfa88wkOxAG/lkyjFFHmFRI+SD1Is026kaFPx/atBeb Y8KRlLrCPs9XEZMSvz24SSyATEFRt5Q7WUTtMIejrHza83+LSy+E6NOJ8QKhhZB2uHyl mUOg== 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=qALOrG6vepevyfdTV65I5X2dgTb+XRjcAA0K1wR5V78=; fh=KeV11nzvo88hufxlmjsqCfOWznUjQ01GrvsGuBkCEic=; b=K43On7N/0eWDoTkgqt+5i9erESt6SCzbVA4FGtwnM/AlQIPQEK5TVmQXrgSql0dXqJ 9Wk4viEnzaEhcYWuKz2XgWmRImQpii+6mFQpeX9Y8bz0vjf30iIobDvhtW133P0H6xuA HV4nKL/xHuKxdSmfLU+pD5AkmQFOW8dlz5G/qZU5VGXTld7/jbswg75wOki7p7faIrm5 nclaAHFhMywMUQ2ItyDmgJB3+iF8MNS8+FeftStX/kVam4LZ1LfL/oIN5uKFLUk218tA lWU96eb5D9asboWVjm0FE1scXaUWQSvqfE1tCzdoWpfNnIFBVofP3h12QSzuVak4mSOm rRoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=avyZOTCx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id r21-20020aa79635000000b00690ccc67aa4si2369548pfg.198.2023.10.20.12.22.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 12:22:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=avyZOTCx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id BC586830102A; Fri, 20 Oct 2023 12:22:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229723AbjJTTWF (ORCPT + 26 others); Fri, 20 Oct 2023 15:22:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229554AbjJTTWC (ORCPT ); Fri, 20 Oct 2023 15:22:02 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F3DE1A8 for ; Fri, 20 Oct 2023 12:21:50 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5a7ac9c1522so17639787b3.0 for ; Fri, 20 Oct 2023 12:21:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697829710; x=1698434510; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=qALOrG6vepevyfdTV65I5X2dgTb+XRjcAA0K1wR5V78=; b=avyZOTCxSheiio0cQy8we9ioz7bsEXKOaiDle56ZEEWD3VeroRzhHAwYc4FvxMOp12 6CrHrDFoZI556Xdrb+S2T5Ipy7xAkWN04RAjc+wKelNnx4Na7l02arP7YLwqEOlWkcLu ufExZn8FipZ9QPhE6+UsYRwJOzotnuX2LtpRfueFfT7c+RsLaTToycOE76C2GsF/xJEl tfvQOgfzs64n6rTLv5nYP0b59jcO8nmPxEhTxl24l20Ip3H8LyAD4Ep0H6ZSorrfw7MD fKicyMxWnxHFtvh1B2OEIGKDclqoQG7f/L2eLd/m7g8/v2/0IzLiZ2W7N6nckd6Ot7ao Le2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697829710; x=1698434510; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=qALOrG6vepevyfdTV65I5X2dgTb+XRjcAA0K1wR5V78=; b=JEd036jt1kOaNkVXAjyQ4X4YjsmlevLlhA2q/JdXpUlqoGUgw1mGXpugxO1179Cxdx 5sszsOSnUh6HgJz5AGflqwLaXOaIYJAVAC9feN1joC9sG1puIbkDlP3DjAvM1ROyZBt3 MbM9Q59f3K5WhYRBOKcjfvl97TQeq4Da5Cx+5XnbhT93EmatHUboYxt1mT17J1Bi5RmV DnkHTYz5GwlqvIv3uLFBU/pOq/jS7K/UniJy6RiukrTH+W01yluszYaWwu6AdI7u5gkp tYWPIdB+GMWLSBGXpaeD0tOuSKBJvsvOuipr9iaOWYRd3pB0+2Q4Oe3z++2YIV7hAUAz Ep6A== X-Gm-Message-State: AOJu0YzZW7b8WvBkA2oK82yQ4+en5WlhXCD8s3921L4N9c2K7GhyBLRP +OH6IlsjY49eR7aTpPFxVOd6U/UfYGGRAY+etw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:d110:0:b0:d9c:c9a8:8c27 with SMTP id i16-20020a25d110000000b00d9cc9a88c27mr57393ybg.13.1697829709856; Fri, 20 Oct 2023 12:21:49 -0700 (PDT) Date: Fri, 20 Oct 2023 19:21:46 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAErTMmUC/x3NwQqDQAwE0F+RnBtYIyj2V0oPyxptoF2XpLUV8 d+NPQ3vMDMbGKuwwbXaQHkRkzk76ksF6RHzxCiDGyhQUwcKaG/Nqaw4qCyshmX+sqJ9Snmu6BW dnK+Y45kJqWm7tuOxpz6BjxblUX7/w9t93w+Y0Zw+gAAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1697829708; l=2442; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=Mdqt94cfpfyPw2z8vNiZUw0jKlb6Y4rhrl6QkPkNsjg=; b=eGMemd00Wx/G5iPloPDERokDgu99pfw0hb8wRp5tP7bzTbL5R7kAwXrl89cUd53z1hIPdIRS8 PsuJh/QEPMuD+eAqiCuQ/YtrDg+fE0fCywNIJFMoI5Bm2NEFlO3Dq6u X-Mailer: b4 0.12.3 Message-ID: <20231020-strncpy-drivers-power-supply-charger-manager-c-v1-1-698f73bcad2a@google.com> Subject: [PATCH] power: supply: charger-manager: replace deprecated strncpy with strscpy From: Justin Stitt To: Sebastian Reichel Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt 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 lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Fri, 20 Oct 2023 12:22:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780303544025633604 X-GMAIL-MSGID: 1780303544025633604 strncpy() is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. We expect cm->psy_name_buf to be NUL-terminated based on its usage with format strings: 1522: cm->charger_psy_desc.name = cm->psy_name_buf; ... 1587: dev_err(&pdev->dev, "Cannot register charger-manager with name \"%s\"\n", 1587: cm->charger_psy_desc.name); Moreover, NUL-padding is not required as `cm` is already zero-allocated and thus any future NUL-byte assignments (like what strncpy() will do) are redundant: 1437: cm = devm_kzalloc(&pdev->dev, sizeof(*cm), GFP_KERNEL); Considering the above, a suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer without unnecessarily NUL-padding. Let's also opt for the more idiomatic strscpy() usage of: strscpy(dest, src, sizeof(dest)). 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 --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/power/supply/charger-manager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- base-commit: bb55d7f7f7445abcc8db50e6a65d4315e79f75c7 change-id: 20231020-strncpy-drivers-power-supply-charger-manager-c-236767ef929c Best regards, -- Justin Stitt diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c index 5fa6ba7f41e1..085d5277bc19 100644 --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -1516,9 +1516,11 @@ static int charger_manager_probe(struct platform_device *pdev) memcpy(&cm->charger_psy_desc, &psy_default, sizeof(psy_default)); if (!desc->psy_name) - strncpy(cm->psy_name_buf, psy_default.name, PSY_NAME_MAX); + strscpy(cm->psy_name_buf, psy_default.name, + sizeof(cm->psy_name_buf)); else - strncpy(cm->psy_name_buf, desc->psy_name, PSY_NAME_MAX); + strscpy(cm->psy_name_buf, desc->psy_name, + sizeof(cm->psy_name_buf)); cm->charger_psy_desc.name = cm->psy_name_buf; /* Allocate for psy properties because they may vary */