From patchwork Thu Oct 12 19:44:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 152151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1461271vqb; Thu, 12 Oct 2023 12:44:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHErMBiaP1yHSOmj90486rsZtVnqa8diTtkHwNDvQ8Io5k9jN/MxAXL3Ii3dPXP89t6qAWa X-Received: by 2002:a17:902:e5d2:b0:1c4:1cd3:8062 with SMTP id u18-20020a170902e5d200b001c41cd38062mr28143725plf.2.1697139890753; Thu, 12 Oct 2023 12:44:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697139890; cv=none; d=google.com; s=arc-20160816; b=PaMerdCWONxspnzih2Ev+2rADzCjojkFG3b8SBXsMcAQZc4PgeD3z5EYbiz6HQKImP i29NXdxQV2GXv6pVQ/Q0n2r0NgO/ARrq0+JSIdXzihHrHjL0uGqV8GAZG/GIldxj1bKO H22hy1/HBb3DcvT2l5mgUk5FS1RmjZM4ArVL/T2P1R7gUDTkiJoTTvK7g6qs3eifBeJm 1A9NFPB2uioWjxg6SMAXApjqOx+ehcquWlxbO0dpdGzvyzTPetqBMUi6j5ZboE5BX0Qd fS4E6EJx/DnswkYU34zUtfAU53LmvJJDyaEGtRObtiFT/13iAzdYfiTv3CyjqWZGVD1W 3Tng== 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=gO2z9DnfSYshDLNqAk2r4T0HlFVlTX7Xeh7UwOdq+BM=; fh=D50PfNqmHr7pkOpV6k15GtNU9E942DKS9hHiWyg+NWE=; b=yV/Yv3zRVrwPobIYPQ9JYpz6+pXyMCdYH8UKYTDHlEiJdBY1K3tqx11brhFNicscom 1qRIXLcqyMT/vJGTUH95h36kyyXmp0QWgspS1joufA4SQdLjeouKyX8D6jKvkG/E4brm tllS0oFKbxxJbG0U0IIBhUrsRR7POr8WK8Xifl+GKtG3EnQYtELrT0Be+Hk2xCv6JGVH LtMZks/DZoOuxL/TRIcZ+yY3f6EMMO4WG2+A7ag8d5yksoR2fDrU9cY+ZFLswL6g6RTp hgunew4LpSExgmCGvPmvq2VUjr5uGTX7hRav2g329GmRnBpZH5aOXkPOXpdwmMMMeaYs MuWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="R/AYuzut"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id kx14-20020a170902f94e00b001c9f54d26bfsi75250plb.516.2023.10.12.12.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 12:44:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="R/AYuzut"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 1F9C583EDDAE; Thu, 12 Oct 2023 12:44:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1442223AbjJLToe (ORCPT + 19 others); Thu, 12 Oct 2023 15:44:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1442098AbjJLTod (ORCPT ); Thu, 12 Oct 2023 15:44:33 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AED0AC0 for ; Thu, 12 Oct 2023 12:44:30 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5a7d1816bccso20223417b3.1 for ; Thu, 12 Oct 2023 12:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697139870; x=1697744670; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=gO2z9DnfSYshDLNqAk2r4T0HlFVlTX7Xeh7UwOdq+BM=; b=R/AYuzutXtUjoUkdxoAx8QJdrc9aRdPIJvFERHD7l4vVyDvDfERXNN8VfpJ+5DjQ7F UHoT5HdBK+nq8Cw2Wr512lSf9sNgb8pWbb9hS7lRAXKrs5LTUJ12n8kiE3jhswe5F1Jk 5GjWHxvr5S8fQof7lqkvRYuiGLw8pA5ELFWAhj6+7Ujr6ATh8z4hPxY6Wo6i5vXANXTO HJxYY8P2jLgPi9u58Ie9tq4fZPXd6ctAOkMxZD0u3fP5ZPx9jn030mTvDlZW7RZf74hc ApwOho+GA+nqQSAgc7FalIEJ0lC1Ehf+jwxDSfnYBPVgUeAB7r1CA5VEEWxEAzBHjj+1 7VZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697139870; x=1697744670; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gO2z9DnfSYshDLNqAk2r4T0HlFVlTX7Xeh7UwOdq+BM=; b=Wpi6MV5Bdu3XJCmIguUl4XpJO1xYYy18vbbNM94VRuyyioMunfv/qpzAGEY58wIA3O Pe3y4pnZiWy4g4pTdlAH7cl8sYrvFi5QzUQc6fnHlwugyhmyu2FjjgAzMSIahTvKW6MY bYqPKlEUrg3M0c3yOKwOswzekaOkstKTxq0fcEhdw8aUCcwFVNZ9vNbV9ifuvtANVjf/ BMre/4u5VsR+enGR4djppS1JyJtgVwMlpSjaqwq+FwB7cinx2zUCJ8b0avJRlrnCB+8y GWAMerg52NS5YKDf9jt1yS0pdBAkURo4rwzncAYeyMzHvgZ01NnufqYCChXVdLir+OF0 vs9Q== X-Gm-Message-State: AOJu0YwKgiKs05PXgpEk7wo+BszKOjN+krygZH0cSWtlIejBiXAJw4mf AscG6U7v63SQozv1vfPzBDNmf0RK+BDBlxl2+g== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a81:a809:0:b0:59b:ebe0:9fce with SMTP id f9-20020a81a809000000b0059bebe09fcemr492781ywh.5.1697139869946; Thu, 12 Oct 2023 12:44:29 -0700 (PDT) Date: Thu, 12 Oct 2023 19:44:29 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAJxMKGUC/z2NywrCMBAAf6Xk7EIeFKO/IlJks7YLsq2bUFJK/ 93owdPMnGY3mZQpm2u3G6WVM8/Swp06g9NDRgJOrY23PjjrPOSigssGSXklzSBUgMpE+pX3ax4 ZG1D+GGKodWDhAgjn2EfrLgn7GEx7LEpPrr//7X4cH8jRxmSPAAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1697139868; l=2934; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=4JcrK7XeBYAz1euC/1Q21LAERMS6P47z2WrDNBYfH9c=; b=EX0OyQuonYdat5F4Jyoc9PfPN/G+udgIrHp7L1KCUE0syRXqblPmt6c1biQlaTBz/d5CrChHJ EkaTcjlNhGrDXu98mTeZac2q96he3ivIEiEBuiM9L0b0wgJaU73KDxX X-Mailer: b4 0.12.3 Message-ID: <20231012-strncpy-drivers-net-ethernet-qlogic-qlcnic-qlcnic_83xx_init-c-v1-1-f0008d5e43be@google.com> Subject: [PATCH] qlcnic: replace deprecated strncpy with strscpy From: Justin Stitt To: Shahed Shaikh , Manish Chopra , GR-Linux-NIC-Dev@marvell.com, "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 fry.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 (fry.vger.email [0.0.0.0]); Thu, 12 Oct 2023 12:44:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779580158037035706 X-GMAIL-MSGID: 1779580158037035706 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 fw_info->fw_file_name to be NUL-terminated based on its use within _request_firmware_prepare() wherein `name` refers to it: | if (firmware_request_builtin_buf(firmware, name, dbuf, size)) { | dev_dbg(device, "using built-in %s\n", name); | return 0; /* assigned */ | } ... and with firmware_request_builtin() also via `name`: | if (strcmp(name, b_fw->name) == 0) { There is no evidence that NUL-padding is required. 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 --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231012-strncpy-drivers-net-ethernet-qlogic-qlcnic-qlcnic_83xx_init-c-7858019dc583 Best regards, -- Justin Stitt diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c index c95d56e56c59..b733374b4dc5 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c @@ -2092,8 +2092,8 @@ static int qlcnic_83xx_run_post(struct qlcnic_adapter *adapter) return -EINVAL; } - strncpy(fw_info->fw_file_name, QLC_83XX_POST_FW_FILE_NAME, - QLC_FW_FILE_NAME_LEN); + strscpy(fw_info->fw_file_name, QLC_83XX_POST_FW_FILE_NAME, + sizeof(fw_info->fw_file_name)); ret = request_firmware(&fw_info->fw, fw_info->fw_file_name, dev); if (ret) { @@ -2396,12 +2396,12 @@ static int qlcnic_83xx_get_fw_info(struct qlcnic_adapter *adapter) switch (pdev->device) { case PCI_DEVICE_ID_QLOGIC_QLE834X: case PCI_DEVICE_ID_QLOGIC_QLE8830: - strncpy(fw_info->fw_file_name, QLC_83XX_FW_FILE_NAME, - QLC_FW_FILE_NAME_LEN); + strscpy(fw_info->fw_file_name, QLC_83XX_FW_FILE_NAME, + sizeof(fw_info->fw_file_name)); break; case PCI_DEVICE_ID_QLOGIC_QLE844X: - strncpy(fw_info->fw_file_name, QLC_84XX_FW_FILE_NAME, - QLC_FW_FILE_NAME_LEN); + strscpy(fw_info->fw_file_name, QLC_84XX_FW_FILE_NAME, + sizeof(fw_info->fw_file_name)); break; default: dev_err(&pdev->dev, "%s: Invalid device id\n",