From patchwork Thu Oct 12 21:43:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 152199 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1513910vqb; Thu, 12 Oct 2023 14:43:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhYBQoYif0Egpj0Ccf7gzM+c/cVoYML0eLeyKqw1dprZ+d1q2a/ESEs2bm2kX2We1CL5vm X-Received: by 2002:a05:6a20:8f01:b0:15a:2c0b:6c81 with SMTP id b1-20020a056a208f0100b0015a2c0b6c81mr29791443pzk.3.1697147014880; Thu, 12 Oct 2023 14:43:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697147014; cv=none; d=google.com; s=arc-20160816; b=T9u2JxFIdjLZ0Cq8NTgPRbCrQy0vFxGqNADGCNC8z48kSQC4WBrMHCcyKSzn4jn5Vh 1W/wdtghxrG8ssKGLHe2v+gdsr6z7qY3mWcm/28XI3lPpXeXnFb4qWu0Bs/R9jnKYzZw Vp/ulGp3qgo+ZB5lLbjVvC/ik5Mb/liKZ7CYH3TOO/Qdzwp46a/pMMRknglVyPYoxmJc 6GYXG1nQqnekpGcCcZ1E83KRcbqKxZ/XsBasnJkJWWHAfXvwBk5A9mpT33B9ihtSuhht gqujyEn5Qq/Eu5p+HIivcuyoLN1J6Mo5oYMm4KOfQVXAMJjEJs9SRPd0ebz9Szc/h7Ka yh0g== 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=ckODqKWwUmyyZSfS7B6anNT9+4anYQ1z042IchWem40=; fh=jNFzfs0LVcNPJYpz3MO9rP5uq1TU3TrcBg7mkF9EWrg=; b=Z6rLEJ4eQT76XY27R/LN/wxkm03HQFstA2OxJocOTuHFZVNTD3NafPnScDDntqGSes HjWfb8ZQOn4myKtNl3tqHsQE5Dd6b/MzF1+TD/ZaRhm5HiCxEGqKB2/QgvT8NsErWPpc DRZ/b11LT0XYv95/tPlBBi82Ig9/603aBRsLmCptUpauvLYJ7Dxdnq4w4FJzzvN/g4a4 dihJ0eM21UkxYCzLTFnVoFSOONMMG7lwzefQJNn9W4rOhnGYi+rAQGaYfIZRwy7SlnNY Lf3vKqYfii/nwW467lUJAz5TT9AtLibnwP3DL1xQ0PW5dvCD843Vc9xHEM7FJuAK38IF vaaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=BqjzRRa3; 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 ls10-20020a17090b350a00b0027d1c7092c2si3242990pjb.110.2023.10.12.14.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 14:43:34 -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=BqjzRRa3; 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 62CA5807C753; Thu, 12 Oct 2023 14:43: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 S1442934AbjJLVnI (ORCPT + 19 others); Thu, 12 Oct 2023 17:43:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344165AbjJLVnH (ORCPT ); Thu, 12 Oct 2023 17:43:07 -0400 Received: from mail-ot1-x34a.google.com (mail-ot1-x34a.google.com [IPv6:2607:f8b0:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9B26B8 for ; Thu, 12 Oct 2023 14:43:03 -0700 (PDT) Received: by mail-ot1-x34a.google.com with SMTP id 46e09a7af769-6c4e17f37acso2053046a34.1 for ; Thu, 12 Oct 2023 14:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697146983; x=1697751783; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=ckODqKWwUmyyZSfS7B6anNT9+4anYQ1z042IchWem40=; b=BqjzRRa3FLGvoIRg6o7G4FNSEtFlsgChV+Y4cW8W+XPqkqSUnyYASRV+YQ+MVF151K D3ZAJp5DXxNOyWt9RcSK9+gyvSMPbjzYeItalcMK1Qgblr/gkYi6XCwkbw/27SmTKvIC lju5Iv1DGwekJ6NgWCqnk3kdmiDnVAqKCMHdzDYwSzc0zSteIINrBSHSuYTTJ5NUvFUc GpsaNpJJQ27Dd+bvOoN1B6syqF/uwjcAdBTRIdbRS46mpYXh07Fxdgb5ZDo+HVu+xwj9 QBAtixvaxSPhhtplXhlMOBwFH/00SoHItql791nkozUifW7Tus7RgAqDrzq5ZdMdRGoS N30w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697146983; x=1697751783; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ckODqKWwUmyyZSfS7B6anNT9+4anYQ1z042IchWem40=; b=F+sJHXY4thi6SldIpiddT+mUTsfGaNSs5ry4whlQugTHSKwXhV6lncntF8iHa8q2Wb a1HgBWz8hUChwmnwwMXANFpxlg93WMNNN7BnTgcMiJPLBLAAU7BVxt3UdfdolWXSVi5x bGYHWWIrFnX8yY6IW6R1CYhsURgDQ4u5OXtqRqiyGLmNl8eYZ64flEvUwBCanPrQ9EHq 9ZrGFWNseSD02fzlfcZpqyqYKxCBQDj50akEOh8Aa3ElAX+Peo4WKm05yAc22hvd+xEs pAtZY8ps36mu1NHH4ZQOPTDaa0734thdlrMva/+PACRUi7+bK7oamQIv4UKNXxmltKdZ 88ng== X-Gm-Message-State: AOJu0YwkpmDH6phfyY08TDOXWe49OFWvkK7HP8aey5Z/tpo//XcbJWEi Qr9AjFBiYSHPFXt2lJmcyOvL4knSycbFSFBKmw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6830:108c:b0:6bd:b74:2dab with SMTP id y12-20020a056830108c00b006bd0b742dabmr7579190oto.2.1697146983205; Thu, 12 Oct 2023 14:43:03 -0700 (PDT) Date: Thu, 12 Oct 2023 21:43:02 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAGVoKGUC/yWNQQqDMBAAvxL27EISodB+RTzU7NbuoTHsSqiIf zfoZWAuMzsYq7DBy+2gXMVkyU1C5yB933lmFGoO0cc++BDRVs2pbEgqldUw84o/kuXGXBoSTkT 0ZPLp0XtoqaL8kf+1GcbjOAG8TR1PdgAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1697146982; l=1715; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=MQMqs+o6dLV3RqgzRciNxc9rt3vo/Ab+9GqIMNjVntc=; b=YWJ6iLREklL66OaSZXMlM8IAnqD7ueQYViHBhLA7JWNoc26BMAl9fiWfKKo0Bmy1yL9ohw3rp 9WCcEeFAoj7DAdqxQCDoWMRWxBwP4A2PVPOF+2SCsBP9uOu++JwQ3fm X-Mailer: b4 0.12.3 Message-ID: <20231012-strncpy-drivers-net-mdio-mdio-gpio-c-v1-1-ab9b06cfcdab@google.com> Subject: [PATCH] net: mdio: replace deprecated strncpy with strscpy From: Justin Stitt To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@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 howler.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 (howler.vger.email [0.0.0.0]); Thu, 12 Oct 2023 14:43:32 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779587628418813373 X-GMAIL-MSGID: 1779587628418813373 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 new_bus->id to be NUL-terminated but not NUL-padded based on its prior assignment through snprintf: | snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id); Due to this, 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 Reviewed-by: Andrew Lunn Reviewed-by: Kees Cook --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/net/mdio/mdio-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231012-strncpy-drivers-net-mdio-mdio-gpio-c-bddd9ed0c630 Best regards, -- Justin Stitt diff --git a/drivers/net/mdio/mdio-gpio.c b/drivers/net/mdio/mdio-gpio.c index 0fb3c2de0845..a1718d646504 100644 --- a/drivers/net/mdio/mdio-gpio.c +++ b/drivers/net/mdio/mdio-gpio.c @@ -125,7 +125,7 @@ static struct mii_bus *mdio_gpio_bus_init(struct device *dev, if (bus_id != -1) snprintf(new_bus->id, MII_BUS_ID_SIZE, "gpio-%x", bus_id); else - strncpy(new_bus->id, "gpio", MII_BUS_ID_SIZE); + strscpy(new_bus->id, "gpio", sizeof(new_bus->id)); if (pdata) { new_bus->phy_mask = pdata->phy_mask;