From patchwork Thu Oct 5 22:52: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: 149043 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2016:b0:403:3b70:6f57 with SMTP id fe22csp611642vqb; Thu, 5 Oct 2023 15:53:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGYy7DX9Y2SXF666FLpXVJR5ilT9ERyEM7VJ6fohUIlGdUGpKjfBhutoqQi8vAh8E3c80xR X-Received: by 2002:a05:6a20:8e08:b0:138:836c:5370 with SMTP id y8-20020a056a208e0800b00138836c5370mr8201551pzj.42.1696546406988; Thu, 05 Oct 2023 15:53:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696546406; cv=none; d=google.com; s=arc-20160816; b=wRGjOW78Sj+BSZzuC/Wi+g95aKvPJB3MoD9uSKt1kestQcOxSz+nbYYiJ7MMiDYsqP 38r6mEkcv0LQ6jTic+i3GlLVk3F6p3aQ1aBmfQeNNY9jDxfGagEqLJEbzLfU+OZyUkDg cS5DFUUBRWLG2WEegPXN4C8kYM4cPdnQvjRzZbqLUzy2E3mG++n4VMtR5pC1+ruocATp e05vw1G43iY9C4j6q6pPht99x5ZdAiP7r5nxWVFbA9AMZ3VsYxkTypNDq9WQv1w2Duy/ EdDOZhnOcnJaolSKNvh0SkUaVvoFYhECj5PNOJ4SkTFZxAqJ4B6vJwPNO04lxq+mWeSN A8lA== 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=3Oz7VGuhkfxzsvalUB4WGErH8Z4TrWqr8F51Ij8/laM=; fh=k0DJpSVuFxhYTyKz71bivhLvl6X/Bx5Sm302pubg0Zg=; b=uoFfF650vlUZt+LOm8N3drx9cKIPf4AX8joc92JrRGoSoK0c4197w/1LX1nckbCrJ3 fLZm/boMp4W5VJRCineYbVzH7Fbh/imDDEudspu0SBQXkY4+NOw8kEOOjt3pWMCXMQ8W Pi7Fv6p+WnfjzDBugJ1uG1QSqaHfqnTqlDXTebDMZ81yupacoB2Bm2SjNL+p2coWWagL Vhbtqy/K6XHSL89KkPyEVAjXy65iZ4wq2tkq0hEGdwgponruPXKZbV8A835UjCM7zmTl C3Nc/zxqLFWjDEF/LjCXLbIk4NRqzqS5mxGp7z8gzcx/1BcPU0WT81eFvr5gbmJ82j/z Qf0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=tHdMIZ5t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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. [23.128.96.33]) by mx.google.com with ESMTPS id dc4-20020a056a0035c400b00690cff4a2b6si197800pfb.112.2023.10.05.15.53.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 15:53:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=tHdMIZ5t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 632B180CBF2A; Thu, 5 Oct 2023 15:53:22 -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 S231940AbjJEWwq (ORCPT + 18 others); Thu, 5 Oct 2023 18:52:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231862AbjJEWwo (ORCPT ); Thu, 5 Oct 2023 18:52:44 -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 C506EDE for ; Thu, 5 Oct 2023 15:52:36 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d865f1447a2so2213273276.2 for ; Thu, 05 Oct 2023 15:52:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696546356; x=1697151156; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=3Oz7VGuhkfxzsvalUB4WGErH8Z4TrWqr8F51Ij8/laM=; b=tHdMIZ5tS8RGbySNTGbtVgs1Zm3RXGpldh3ytPh+vSsFme5ZjHyfogfTbuu0W864Z8 HnEjq/qv5BKK/9eoLfX2INT7dGyE4Z1cQstNXT60D90gxRqI7CwxBFsJeaFh26Wuo5Av GPN2UsVCZLG9kIPnmCwkl01UBTunFKUIMGQv1zAerck0cbLNNjAh2TwscdyZdTD/2EvI 1yChzX//yb2G+VD2PQZyPNtFbxlAWRV99mHxrPNK/axfMOS+8Vod7EGE3dOLzUAHjq8Y rM0De59R8wNUZoP90ueE64m9whQ5o7ZrksPfsVzTZMS+C9Bd/HjKxwljx/LCzJmmGvHN Wmeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696546356; x=1697151156; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3Oz7VGuhkfxzsvalUB4WGErH8Z4TrWqr8F51Ij8/laM=; b=d882cP3tPXfTgirzRYnLfoQG70bcCzPGdm+8NXHWyOWnqJdffL4OzFoSKZuHebWRqK u6LdjW1Z4rkfpNA+KiWiC15Le7heSUOfte8TX1mH6k2DgFqrTaNBkW7UWT2Hz+5y25qD 6/H1qfYhDP2PbOCg1+bSibuGUxWs0/BDE2+bT31Vg/wb4gaA3ZZ+kz6EIszvDGqpiqCo HiQ6+I5OLIv4JGYHo0PH449st4sri0fHTEbCQouqoXDDDaL4E4AQqq32pDoxa9uoelmE S3ZISHmuKCd6PdYVX3e0BtvOLFBWvSsKmWCSQs459uDEkZVjc1iOseRg/TYOOEcZ3fkZ hUWg== X-Gm-Message-State: AOJu0Yyr3lgq/WH1CyD0wqZ3PIl8pwFVthLuSlaB9TuS9I8R8YEhsH9U L9SlVNaTEHPtIh6inUg2YI5oQCS9GThrWbuDhQ== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:68ce:0:b0:d86:56bc:e289 with SMTP id d197-20020a2568ce000000b00d8656bce289mr102971ybc.4.1696546356067; Thu, 05 Oct 2023 15:52:36 -0700 (PDT) Date: Thu, 05 Oct 2023 22:52:34 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIADI+H2UC/x2NywrCMBAAf6Xs2YU0Nb5+RUTqZmsXNKmbNCil/ 270NnOZWSCxCic4NQsoF0kSQ5V20wCNfbgziq8O1tiuNcZhyhpo+qBXKawJA2fkPLL+gPoi8xM f8prFS8RImWO4+homRsLO7Y92t70NB+OgLiblQd7//fmyrl/ZrJ0VjgAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1696546354; l=2673; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=fHSGB3GybAy+lcwImCPC6umWTJnnaa6Fe/COzeftew4=; b=2ACCQqBmGkLvXioby9De9Mcm2kl8X/AKHpYXgLlmc18u5LikoehfZYt35LQvAVFalOi3YAlDi +/o6ilE3nP7AZKwVkQdZGhrazudQ3OAHN7r1l377kiu1UNfXo7neP/x X-Mailer: b4 0.12.3 Message-ID: <20231005-strncpy-drivers-net-ethernet-cavium-liquidio-octeon_device-c-v1-1-9a207cef9438@google.com> Subject: [PATCH] cavium/liquidio: replace deprecated strncpy with strscpy From: Justin Stitt To: Derek Chickles , Satanand Burla , Felix Manlunas , "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 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]); Thu, 05 Oct 2023 15:53:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778957845291346627 X-GMAIL-MSGID: 1778957845291346627 `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 `app_name` to be NUL-terminated: dev_info(&oct->pci_dev->dev, "Running %s (%llu Hz)\n", app_name, CVM_CAST64(cs->corefreq)); ... and it seems NUL-padding is not required, let's opt for strscpy(). For `oct->boardinfo.name/serial_number` let's opt for strscpy() as well since it is expected to be NUL-terminated and does not require NUL-padding as `oct` is zero-initialized in octeon_device.c +707: | buf = vzalloc(size); | if (!buf) | return NULL; | | oct = (struct octeon_device *)buf; Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] 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. --- drivers/net/ethernet/cavium/liquidio/octeon_device.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231005-strncpy-drivers-net-ethernet-cavium-liquidio-octeon_device-c-3579264bf805 Best regards, -- Justin Stitt diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c b/drivers/net/ethernet/cavium/liquidio/octeon_device.c index 364f4f912dc2..6b6cb73482d7 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_device.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.c @@ -1217,10 +1217,10 @@ int octeon_core_drv_init(struct octeon_recv_info *recv_info, void *buf) goto core_drv_init_err; } - strncpy(app_name, + strscpy(app_name, get_oct_app_string( (u32)recv_pkt->rh.r_core_drv_init.app_mode), - sizeof(app_name) - 1); + sizeof(app_name)); oct->app_mode = (u32)recv_pkt->rh.r_core_drv_init.app_mode; if (recv_pkt->rh.r_core_drv_init.app_mode == CVM_DRV_NIC_APP) { oct->fw_info.max_nic_ports = @@ -1257,9 +1257,10 @@ int octeon_core_drv_init(struct octeon_recv_info *recv_info, void *buf) memcpy(cs, get_rbd( recv_pkt->buffer_ptr[0]) + OCT_DROQ_INFO_SIZE, sizeof(*cs)); - strncpy(oct->boardinfo.name, cs->boardname, OCT_BOARD_NAME); - strncpy(oct->boardinfo.serial_number, cs->board_serial_number, - OCT_SERIAL_LEN); + strscpy(oct->boardinfo.name, cs->boardname, + sizeof(oct->boardinfo.name)); + strscpy(oct->boardinfo.serial_number, cs->board_serial_number, + sizeof(oct->boardinfo.serial_number)); octeon_swap_8B_data((u64 *)cs, (sizeof(*cs) >> 3));