From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 37B4D4326F for ; Thu, 2 Nov 2023 14:13:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 31F2342D80; Thu, 2 Nov 2023 14:13:51 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 84E4D402E3 for ; Thu, 2 Nov 2023 14:13:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kEnF2uEBb9IDbO3P+sJgMARuGZJunvlgTr3PJkncPIA=; b=D3n5oLvHNMsGvV3F9QEBxsinN5Q1dt5TlCrsBeLqaLr2xxg7iN2LNKEEMumWNGD7VptKaJ Ij3XsECJ0IrtiXyLA3Effqcj6xkUToEn3XAqmlOXWcJqxnupI2fVwQlfamstoUSKy/xNML ZUE16Be8QB8b7+T9biR0X8biIdtsAdE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-546-ddWTppIgN8aSREvw_dRTfA-1; Thu, 02 Nov 2023 09:13:46 -0400 X-MC-Unique: ddWTppIgN8aSREvw_dRTfA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9530A88CDCD; Thu, 2 Nov 2023 13:13:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EB25492BFA; Thu, 2 Nov 2023 13:13:44 +0000 (UTC) From: Kevin Traynor To: David Christensen Cc: Stephen Hemminger , Ferruh Yigit , dpdk stable Subject: patch 'net/tap: use MAC address parse API instead of local parser' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:31 +0000 Message-ID: <20231102131254.315947-25-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/08/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/da9e764370f62bfa407a93531452b2e0e69ee95b Thanks. Kevin --- >From da9e764370f62bfa407a93531452b2e0e69ee95b Mon Sep 17 00:00:00 2001 From: David Christensen Date: Tue, 3 Oct 2023 13:29:09 -0700 Subject: [PATCH] net/tap: use MAC address parse API instead of local parser [ upstream commit b79d825f32cb0012164b26428272b1ea268f839d ] Building DPDK with gcc 12 on a ppc64le system generates a stringop-overflow warning. Replace the local MAC address validation function parse_user_mac() with a call to rte_ether_unformat_addr() instead. Bugzilla ID: 1197 Signed-off-by: David Christensen Signed-off-by: Stephen Hemminger Acked-by: Ferruh Yigit --- drivers/net/tap/rte_eth_tap.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 2dbb25f85d..470ea65f93 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -2240,27 +2240,4 @@ set_remote_iface(const char *key __rte_unused, } -static int parse_user_mac(struct rte_ether_addr *user_mac, - const char *value) -{ - unsigned int index = 0; - char mac_temp[strlen(ETH_TAP_USR_MAC_FMT) + 1], *mac_byte = NULL; - - if (user_mac == NULL || value == NULL) - return 0; - - strlcpy(mac_temp, value, sizeof(mac_temp)); - mac_byte = strtok(mac_temp, ":"); - - while ((mac_byte != NULL) && - (strlen(mac_byte) <= 2) && - (strlen(mac_byte) == strspn(mac_byte, - ETH_TAP_CMP_MAC_FMT))) { - user_mac->addr_bytes[index++] = strtoul(mac_byte, NULL, 16); - mac_byte = strtok(NULL, ":"); - } - - return index; -} - static int set_mac_type(const char *key __rte_unused, @@ -2284,5 +2261,5 @@ set_mac_type(const char *key __rte_unused, } - if (parse_user_mac(user_mac, value) != 6) + if (rte_ether_unformat_addr(value, user_mac) < 0) goto error; success: -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.487951720 +0000 +++ 0025-net-tap-use-MAC-address-parse-API-instead-of-local-p.patch 2023-11-02 13:09:40.810163326 +0000 @@ -1 +1 @@ -From b79d825f32cb0012164b26428272b1ea268f839d Mon Sep 17 00:00:00 2001 +From da9e764370f62bfa407a93531452b2e0e69ee95b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b79d825f32cb0012164b26428272b1ea268f839d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index bf98f75559..b25a52655f 100644 +index 2dbb25f85d..470ea65f93 100644 @@ -25 +26 @@ -@@ -2268,27 +2268,4 @@ set_remote_iface(const char *key __rte_unused, +@@ -2240,27 +2240,4 @@ set_remote_iface(const char *key __rte_unused, @@ -53 +54 @@ -@@ -2312,5 +2289,5 @@ set_mac_type(const char *key __rte_unused, +@@ -2284,5 +2261,5 @@ set_mac_type(const char *key __rte_unused,