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 15E39A0555 for ; Thu, 9 Jun 2022 13:37:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0FBE54069C; Thu, 9 Jun 2022 13:37:24 +0200 (CEST) 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 74FD94069C for ; Thu, 9 Jun 2022 13:37:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774642; 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=7QhjmxK077x9ddh/IF0k0FfgC3onwIz1OkaY/FxA5F8=; b=W1zHVc6Uc+freJe7BE7AXOS5Nac/dzTy0Yk3wXDu4AeATqcCYx3CNCCHjB5NUKYTxs4L83 bd6KPkKRslgtltRFyr5ViGVXEqM0XeGIJdJyUyurNJ6nbeGz2zexaHbAJ6QQC1ss57zOTP 0q4glonRC4c8ifA3HrF6a/aSuh4j92g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-246-rqydo5AdNbK9njxdqTSS_w-1; Thu, 09 Jun 2022 07:37:19 -0400 X-MC-Unique: rqydo5AdNbK9njxdqTSS_w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BDAE3185A7B2; Thu, 9 Jun 2022 11:37:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF11918EA6; Thu, 9 Jun 2022 11:37:17 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Vladimir Medvedkin , dpdk stable Subject: patch 'rib: fix traversal with /32 route' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:35:53 +0100 Message-Id: <20220609113701.386938-6-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/22. 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/6bbdd05838e297f3980d6d221848057f696b99a7 Thanks. Kevin --- >From 6bbdd05838e297f3980d6d221848057f696b99a7 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 14 Apr 2022 13:01:04 -0700 Subject: [PATCH] rib: fix traversal with /32 route [ upstream commit 1b984e98a3fd00e607ec14b8b9299a2f14698dc3 ] If a /32 route is entered in the RIB the code to traverse will not see end of the tree. This is due to trying to do a negative shift which is an undefined in C. Fix by checking for max depth as is already done in rib6. Fixes: 5a5793a5ffa2 ("rib: add RIB library") Signed-off-by: Stephen Hemminger Acked-by: Vladimir Medvedkin --- lib/rib/rte_rib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c index 6c29e1c49a..1a4b10d728 100644 --- a/lib/rib/rte_rib.c +++ b/lib/rib/rte_rib.c @@ -74,4 +74,6 @@ static inline struct rte_rib_node * get_nxt_node(struct rte_rib_node *node, uint32_t ip) { + if (node->depth == RIB_MAXDEPTH) + return NULL; return (ip & (1 << (31 - node->depth))) ? node->right : node->left; } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:29.933581768 +0100 +++ 0006-rib-fix-traversal-with-32-route.patch 2022-06-09 12:34:29.611980412 +0100 @@ -1 +1 @@ -From 1b984e98a3fd00e607ec14b8b9299a2f14698dc3 Mon Sep 17 00:00:00 2001 +From 6bbdd05838e297f3980d6d221848057f696b99a7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1b984e98a3fd00e607ec14b8b9299a2f14698dc3 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index cd9e823068..0603980cab 100644 +index 6c29e1c49a..1a4b10d728 100644 @@ -25 +26 @@ -@@ -72,4 +72,6 @@ static inline struct rte_rib_node * +@@ -74,4 +74,6 @@ static inline struct rte_rib_node *