From patchwork Tue Oct 10 21:24:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Stitt X-Patchwork-Id: 150973 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp144806vqb; Tue, 10 Oct 2023 14:25:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEkPcKNnqoFSc3tEFsQ0if5qbi5U7HiQaNTl0G8I3aip5kx/HRWFvyw8uiMAmvt3Uccx5Zt X-Received: by 2002:a05:6a21:a5a0:b0:15d:a247:d20c with SMTP id gd32-20020a056a21a5a000b0015da247d20cmr25516857pzc.6.1696973107062; Tue, 10 Oct 2023 14:25:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696973107; cv=none; d=google.com; s=arc-20160816; b=AhNasj3oJg0lS+Gdmx+1r1CsPpIb49MvkDsjg40D+JomD8t9/WskGUzJ4z2ez9DFY/ UoLdBw2CH0L1IxlheyO2tQX8thzieYkWpRtmZN6hwWhvyQvJR/YYm8BMAID0qzA8c61N yA7nRJbVl82ThyQjFwmQUlxl6tdX+/ihUKD0BwjJTFYup+7yuwb8HfsSDvGH3IrzBm3R vWO1UsI3N/4qsixoKE0VXALpSrPn+UZx8C9JulaPpSsRqKQEPdsY6INlKcwZFpw7BEMr SG5QHJzlP1l4RtA4TuyCB+nWlnhHJBxi7M0clBba5ddRL3wvy7WCZrgjUc1dBJ8dg9Oa GUrg== 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=MDV5AFh8umN8bQ6h2/MOjPGq8sl8c8sCGHuPzTkmxh8=; fh=pFmXXHuHDZRUyztWzZFMDLjKS7W38whuoiadSIbFkwc=; b=lAzvhqPwgmnh3a30tUv2Mnf0xJUWTOhHxRwZWIiTx0p4I1+nM54nKMuIWu3Y4Xl0ck XYUbNRpk7f3iPzHvbKiBB6N8bYNFXgSqhYoMZRFkkTIOrvHw+zbAiGx3L4RF2lT6Udy8 Y3sKryMY3vXI2f8nGnVqa68JvwN/wBLpPXNyFRAJ4LcyiQEdwv8HvcV8WGZccaV+Sa8a OqtflsyO0i7mQqEFnAY6/mYU/nkVyD6AII+m6T/4cIP1tO66EjHa+GC7qeeul5evJEQu jNFHK/Ja9sGxymq7FjCnHcqYWYpJaGHGaaikpOEpIa9kfix7YwDHaYmC7oQc77qbxD9O tHKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=IDIj7Ddz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id y7-20020a636407000000b00580e32f7793si12894303pgb.151.2023.10.10.14.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 14:25:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=IDIj7Ddz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 4E3CC83B7A9B; Tue, 10 Oct 2023 14:25:04 -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 S1343979AbjJJVYt (ORCPT + 19 others); Tue, 10 Oct 2023 17:24:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbjJJVYr (ORCPT ); Tue, 10 Oct 2023 17:24:47 -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 9265194 for ; Tue, 10 Oct 2023 14:24:44 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d9a581346c4so1663988276.0 for ; Tue, 10 Oct 2023 14:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696973084; x=1697577884; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=MDV5AFh8umN8bQ6h2/MOjPGq8sl8c8sCGHuPzTkmxh8=; b=IDIj7Ddzda4+83aU0PkTht9LNRl+jUTwUW0RREBZHGylXYy+D6XrP8pLbk3e9fRXrW K+KZDp0Dk0iGis9lbIHlKi0Eb/nOQ8C7EYi/avbtMZCfplOPILR3HlU1rEj9FkpMOYT9 XdSoByiqELx2J1l3kTaSdLcWCycqdNxfOXcmGjj3aVLxz/W7HTJWJyxnKUes15enI0mg XzTne2uDDJDr2KrrVWiVvyqlY+FF+LXFYnWTfxbC6VpGdr/7wC5jIyTV6zDw55bCaSMm O9P1mWtLt7KMzlsTQzPungcbP/MwyPt1UQwUv+xzTIniUd5tCSCdCM7w5QYNf1oOkTMq P5yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696973084; x=1697577884; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=MDV5AFh8umN8bQ6h2/MOjPGq8sl8c8sCGHuPzTkmxh8=; b=jA5bQIuDbvdpH0IzfrEvPyTrGR9+ymZbVBdVZkD8Wt2Lm0JJYTVWccemX2lWSzIIOQ G+xswAc8WAk5R7UD/TMsIA7aD4R88IHRWhsbsc8IorcoiwaixCZE0/eq3FIRs3EFSiCV dxTMf9zr/SSao7L8UC06vbPnZOqQB5fuFrzftbGPNoiVP1LGpQyAaHS0f6kSOKsTiPrU gAP1V9j4w8dvnta6siCfeo/Wd+0cwSwWh6re/bqqma8H5D+O9AzJDNPBkrNhg/uRxt8G Yab1tG0z9EHlKL3Gcq7r7N11yn3RspEtFYQBmGhiVqHPO80wudiO1NY+ZzPvkMUpYdak BUwQ== X-Gm-Message-State: AOJu0YyzhP+B/j7ZtUmCZD1upfNemMZpSjwqZVLdw8NdEBLNQ9UprFNY 3Z23M7MqQ+zDSYtRegwXHLqlqpWdlXsVT905Sg== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a25:4d45:0:b0:c78:c530:6345 with SMTP id a66-20020a254d45000000b00c78c5306345mr278663ybb.7.1696973083763; Tue, 10 Oct 2023 14:24:43 -0700 (PDT) Date: Tue, 10 Oct 2023 21:24:42 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIABnBJWUC/yWNywrCMBBFf6XM2oEkFXz8ikgJ04kdaGKYhKCU/ rtRN4d7NvdsUFiFC1yHDZSbFHmmLvYwAC0+PRhl7g7OuNEaa7BUTZTfOKs01oKJK3JdWL8jem2 8rhhbzu7PKXpJSMiX03GkYCmcA/T3rBzk9Svf7vv+AYQ2UsSJAAAA X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1696973082; l=2215; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=CSoT1kieiSbChFcFcvh9dHJInopCbsLzGtEWqjj1yLE=; b=3ywEvfgWmiMy0QLDM7svFMz2ZM1hoQo7JNuVhO3w/dKt/FOTx8g8Ys2j+qCaZxeUmltd8AeF3 G5h0tn2qzj8AJJVKVR/VHx3ZZ1NrEKuHP+IAUTyUGdAH5uNVpCmXusg X-Mailer: b4 0.12.3 Message-ID: <20231010-strncpy-drivers-net-ethernet-marvell-mvpp2-mvpp2_main-c-v1-1-51be96ad0324@google.com> Subject: [PATCH] net: mvpp2: replace deprecated strncpy with strscpy From: Justin Stitt To: Marcin Wojtas , 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=-4.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=no 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]); Tue, 10 Oct 2023 14:25:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779405272665766148 X-GMAIL-MSGID: 1779405272665766148 `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 `irqname` to be NUL-terminated based on its use with of_irq_get_byname() -> of_property_match_string() wherein it is used with a format string and a `strcmp`: | pr_debug("comparing %s with %s\n", string, p); | if (strcmp(string, p) == 0) | return i; /* Found it; return index */ NUL-padding is not required as is evident by other assignments to `irqname` which do not NUL-pad: | if (port->flags & MVPP2_F_DT_COMPAT) | snprintf(irqname, sizeof(irqname), "tx-cpu%d", i); | else | snprintf(irqname, sizeof(irqname), "hif%d", i); 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. --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 change-id: 20231010-strncpy-drivers-net-ethernet-marvell-mvpp2-mvpp2_main-c-e9743cf1cf8f Best regards, -- Justin Stitt diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 21c3f9b015c8..331dba2ae13d 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5831,7 +5831,7 @@ static int mvpp2_multi_queue_vectors_init(struct mvpp2_port *port, v->type = MVPP2_QUEUE_VECTOR_SHARED; if (port->flags & MVPP2_F_DT_COMPAT) - strncpy(irqname, "rx-shared", sizeof(irqname)); + strscpy(irqname, "rx-shared", sizeof(irqname)); } if (port_node)