From patchwork Thu Dec 7 21:57:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 175448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5086818vqy; Thu, 7 Dec 2023 13:58:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IH1PviD2rRogVJJ5ibgvlkJD3WBE6FVGwgDusxkXIEKETGez3yzY0kgsDYAkDzw5t1ad+ae X-Received: by 2002:a05:6358:919b:b0:16b:c64b:5dad with SMTP id j27-20020a056358919b00b0016bc64b5dadmr4598887rwa.10.1701986280451; Thu, 07 Dec 2023 13:58:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701986280; cv=none; d=google.com; s=arc-20160816; b=T9Kr+VqlZ0exrNH4k+bfzQTl4p3tHgWt3T2t5oI+Cb6znOe8PPgR6dxNtRGXve5m37 xAzIO0ArdMaOBOQaNsm5kjN6NQ5PrsK3Q5FK0Oig7lXwC7cmEhcy6EO0zTMSzrhkHRXD oh6FUTKyWnroeZq7svguS3LbsMy5gW9n/+Iry+EVTBcbanXe/oUGaXU/0YNgz/9Y9wMY rVpifM3RFkZjgHMt+bYMVrMiSG5U816aRlY7vmfHvTwWvFXCG+LYTaJ6EwcYhaK5Nobl q7E9mc2vddPTyg0W6pgDQZ0fE0OywPA/Kqoopez1T/rpGsM/T1IvgevmlSL341VQxWLv z5Ag== 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=s948J7sj5ORs8qgkiDHhUgJdtPkA+zULgTGFCTqedVM=; fh=jNFzfs0LVcNPJYpz3MO9rP5uq1TU3TrcBg7mkF9EWrg=; b=pJYDcnpip0yQfzLDnVWXwY+b0Shw5QzpH4UhWbFqLiFRi6CvzyCWdr+M8Lm8ayfLxC +9oPdkIujWm4/ru4mU90kElaWePMHCSFGOT9JAkNdwWijAwN1xCFPhO/2nVqo7jeSpqD 7e2zGF2IbPAe70hbpSrtprsqUb0L8ENBrhp2BIjPN40bKiM91xguVHlbmT7zOQs5T3KW w+qJyydoThXNm08IWXs9K8KtYJ2kDASVXxKMIl05NpMD2JL6S4uibgQiQxzy+3mLFWEW R2s/Swvn0ZMwSE3mg4KVA8O3Uw592YJmzYxyuRS4Nr8WUSoWi07Q0fo7ftSked9xdCM1 b+iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=porlm07H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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. [23.128.96.36]) by mx.google.com with ESMTPS id f15-20020a65628f000000b005bdbf2ac2d2si351406pgv.85.2023.12.07.13.58.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 13:58:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=porlm07H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 6E01581FD2A8; Thu, 7 Dec 2023 13:57:57 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231918AbjLGV5r (ORCPT + 99 others); Thu, 7 Dec 2023 16:57:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231481AbjLGV5p (ORCPT ); Thu, 7 Dec 2023 16:57:45 -0500 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 CF8F01719 for ; Thu, 7 Dec 2023 13:57:51 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5d3eafe3d17so8714947b3.1 for ; Thu, 07 Dec 2023 13:57:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701986271; x=1702591071; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=s948J7sj5ORs8qgkiDHhUgJdtPkA+zULgTGFCTqedVM=; b=porlm07HgQHMKQQzk+mhrOF3+zwuTyCexHRJI/E86kTcDYRT2WqgKTvmbBGGzcIns/ DFK8/NSiUWl78tGe53QWcEUxHsHFcHVyRhKSX7uYcGMjTD+cZQGrKbtstqmx5JLfTBZH f6LwLEUmF6BIUJZ5c5zcA06rbCv/fpRtp2NbJYRmwQcHOwHUjkFXIJWQjgde57JRAtP8 bcmIcOHMjtnV4oJawgTTM6cvpNje6abh3fsADhUBXWm1+iorW4z66G9aiHSUri/avm4S 0KT4isYymoKyDzGTafcYMdGsCZkRZpeIycdNzhVkj3Un2p0OGkzftjrmuKz/8WOLsOCh CxPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701986271; x=1702591071; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=s948J7sj5ORs8qgkiDHhUgJdtPkA+zULgTGFCTqedVM=; b=VnDHgIjW5dQqmFyKM7WcMVZWzC5Z8zAoqSkK2rgtKZKzmPB7VwSEFNogivgAfaEOD9 DNOpFBbytGIc/cWtE+zibwUVquUYo03tUVXTr1/iq1GqxVvrYuQkbYAkqcY9FatDB8U9 Bq5QOKkYpRTNjKvEFZdObwmdjgUl3F+w65pB8i5eFukNbCBI2bV14zpDyuwRZ3u6oIcZ FuOJEN0aAYjuabDKj5ABj2gmRL2kXOUabSfI1PrTdmRl6zQ8L7keGqb6ZhhqiQioCKW+ ITtaQNA/JFsu0MNl7nhySmsIbE4yu/vf+1lPZZglCDv3hUMgjwsRE0I+CQOkR2YZCm4b kAaw== X-Gm-Message-State: AOJu0Yy3krCF8X4Uto1KV51Rlng0Q+9AcrjsSPV8tNrg1CccJz72fZkk LxuiFNFY0G5jyWmVTEZLRpYuqosyjzKzS82qTw== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:8582:0:b0:db7:d0d3:8579 with SMTP id x2-20020a258582000000b00db7d0d38579mr150760ybk.6.1701986271039; Thu, 07 Dec 2023 13:57:51 -0800 (PST) Date: Thu, 07 Dec 2023 21:57:50 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAN0/cmUC/5WNQQ6CMBBFr2Jm7Zh2BFFX3sMQg+0Ak0hLWmwkh LtbuYH5q/cX7y0QOQhHuO4WCJwkincZaL8D0zeuYxSbGUjRUStNGKfgzDijDZI4RHQ84djPOFj xj+c7okHVKFvyuSorTZBFY+BWPlvkXmfuJU4+zFsz6d/7lz5pzCupID61FzbFrfO+e/HB+AHqd V2/oLuxHdUAAAA= X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1701986270; l=2438; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=7MECXZW2pvskksG435akbDYczjb3pqkffjxJYPwtntE=; b=Wf+9RMODL0PYxFtMgH/aTsi773KuPKHsUSd9qAJ3z7dlVFCRTM9qMMaPzWgYaq5HHO9kkSFR8 1GjFxwGAjglAySyx1KrP+8q6vWP3MMUcwQyUpkqhHETvBcAl1QEZRTz X-Mailer: b4 0.12.3 Message-ID: <20231207-strncpy-drivers-net-phy-mdio_bus-c-v2-1-fbe941fff345@google.com> Subject: [PATCH v2] net: mdio_bus: 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,T_SCC_BODY_TEXT_LINE, 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 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, 07 Dec 2023 13:57:57 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784661965880050822 X-GMAIL-MSGID: 1784661965880050822 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 mdiodev->modalias to be NUL-terminated based on its usage with strcmp(): | return strcmp(mdiodev->modalias, drv->name) == 0; Moreover, mdiodev->modalias is already zero-allocated: | mdiodev = kzalloc(sizeof(*mdiodev), GFP_KERNEL); ... which means the NUL-padding strncpy provides is not necessary. 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. 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: Kees Cook --- Changes in v2: - rename subject line as it was the same as another and was causing problems. - rebased onto mainline bee0e7762ad2c602 - Link to v1 (lore): https://lore.kernel.org/r/20231012-strncpy-drivers-net-phy-mdio_bus-c-v1-1-15242e6f9ec4@google.com - Link to v1 (patchwork): https://patchwork.kernel.org/project/netdevbpf/patch/20231012-strncpy-drivers-net-phy-mdio_bus-c-v1-1-15242e6f9ec4@google.com/ - Link to collided: https://patchwork.kernel.org/project/netdevbpf/patch/20231012-strncpy-drivers-net-mdio-mdio-gpio-c-v1-1-ab9b06cfcdab@google.com/ --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/net/phy/mdio_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: bee0e7762ad2c6025b9f5245c040fcc36ef2bde8 change-id: 20231012-strncpy-drivers-net-phy-mdio_bus-c-0a0d5e875712 Best regards, -- Justin Stitt diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 25dcaa49ab8b..6cf73c15635b 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -506,7 +506,7 @@ static int mdiobus_create_device(struct mii_bus *bus, if (IS_ERR(mdiodev)) return -ENODEV; - strncpy(mdiodev->modalias, bi->modalias, + strscpy(mdiodev->modalias, bi->modalias, sizeof(mdiodev->modalias)); mdiodev->bus_match = mdio_device_bus_match; mdiodev->dev.platform_data = (void *)bi->platform_data;