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 54271A054A for ; Tue, 25 Oct 2022 17:09:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 500C342C38; Tue, 25 Oct 2022 17:09:25 +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 1FB6242C1D for ; Tue, 25 Oct 2022 17:09:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710562; 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=P6kUWf65KKDb1Tku3WOaEtBWZgDv6nlDFxt0YtSiMrQ=; b=SxRoD9fgFXkjNIQbtD2mCHBf8EJsdv6ANcHteZ/hFYNAmuejIwj0amQxQY+J5+RdCs5eF9 ws7qPDdc2fEHcnBtWesZ5Nju2kkIB/0fSGdHIcPLsfdkTgrRUw2OpfORjJ2MVO7NFiPdfz 9lYL9Ut8b1HKj6DDIvbNIi5MkBpFztg= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-298-nd5WPSdrMRqGOZtces9xUA-1; Tue, 25 Oct 2022 11:09:19 -0400 X-MC-Unique: nd5WPSdrMRqGOZtces9xUA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 035FD1C0A593; Tue, 25 Oct 2022 15:09:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4A984B400F; Tue, 25 Oct 2022 15:09:13 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Jesse Brandeburg , Qiming Yang , dpdk stable Subject: patch 'net/ice/base: fix array overflow in add switch recipe' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:50 +0100 Message-Id: <20221025150734.142189-55-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.3 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/01/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/e075b36c5fe2a0442a144433d981cee49c0542b2 Thanks. Kevin --- >From e075b36c5fe2a0442a144433d981cee49c0542b2 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Aug 2022 03:31:25 -0400 Subject: [PATCH] net/ice/base: fix array overflow in add switch recipe [ upstream commit 289b2846c187aa061c13d6a499d0321f581390a5 ] The array indexes in this function are used with a zero index in the fv_idx table, and with a +1 index in the lkup_idx arrays. The code was using the lookup index for the field vector in only one place in this function, but the code was never used after this point so just remove the bad line. This was caught by the undefined behavior sanitizer. Fixes: fed0c5ca5f19 ("net/ice/base: support programming a new switch recipe") Signed-off-by: Jesse Brandeburg Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index c0df3a1815..17d292c0db 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -7322,5 +7322,4 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, LIST_FOR_EACH_ENTRY(entry, &rm->rg_list, ice_recp_grp_entry, l_entry) { - last_chain_entry->fv_idx[i] = entry->chain_idx; buf[recps].content.lkup_indx[i] = entry->chain_idx; buf[recps].content.mask[i++] = CPU_TO_LE16(0xFFFF); -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.780874703 +0100 +++ 0055-net-ice-base-fix-array-overflow-in-add-switch-recipe.patch 2022-10-25 14:18:58.433798170 +0100 @@ -1 +1 @@ -From 289b2846c187aa061c13d6a499d0321f581390a5 Mon Sep 17 00:00:00 2001 +From e075b36c5fe2a0442a144433d981cee49c0542b2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 289b2846c187aa061c13d6a499d0321f581390a5 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index e59d191c46..b8e733f539 100644 +index c0df3a1815..17d292c0db 100644 @@ -28 +29 @@ -@@ -7316,5 +7316,4 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, +@@ -7322,5 +7322,4 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm,