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 3666DA00C2 for ; Thu, 3 Nov 2022 10:30:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2BB5140694; Thu, 3 Nov 2022 10:30:12 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 63EFB40693 for ; Thu, 3 Nov 2022 10:30:10 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id w14so1705442wru.8 for ; Thu, 03 Nov 2022 02:30:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ycXlWJH+DmoUb65JxeT8vvIQo/3fQtKHVTkbwU++0OU=; b=Wk/0dMhPXv7bdW4AaCrKXSMNE4+WOnQ2e2Bzu0n0VyCGevWKX5JNGVy1jYpobTDQ8f jH4V9ptoYUJy8XB+XcY5I7GfUOJ2iCgGhcizSLniz95xxtJAIMtBn0XGlDlkobeBETYf ol+wHD7HiTY7ZvuxnJaB/bqAoa6ntZ5rFqK4dU8c5PQBRWd0BM6tQu535XEco4FiveSP NNV8whj3I16Vs3IlNxXw+xaW3G4pgGjx8DSVRcCVJvkb03ubYdw4itvY1ZcBhNF7wpXk /9+t3SoYSc70Uwli7BpNTxKm96CDvcYGJy9y11Ws3bXF1UHX0LJdhqXCb/gjXYdlf+uL WuzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ycXlWJH+DmoUb65JxeT8vvIQo/3fQtKHVTkbwU++0OU=; b=bxkStTiLwC6HoMxI93d1nAC2iM9gy3u0wO0tLPThxPyQCXEJF0Tfx8L473j4/OMSIk EuM3vp0GPSqblf/94V5o1s2Lc+EmMMB+ztrBBKr45+bgmJ9NHj1NmS/HMStFYD7gyxB9 3Qrg67oMLIeEq8qZ4s4RPMIS90CQH203csnqwXm/JMBL69d05FmNjxgvBJ1FDTgRxeAG 66P7RkEfO+JEf5+IjSp6FvfJ8Mv1Xel92JwwbBlzPaG403l2xWrpi/ciZD1vdYJHwHJ6 DRzguGW/XkKPapBgDQHHhz4KwMdQiSXu/aMfBnclp7/j/5jb/RRQdYyzw1+YugSvnns8 VYZw== X-Gm-Message-State: ACrzQf0wnTYNw6QWH8eOG2gz7MpT4YvJf7vjWJ1Qoie9v9iTgomfnH2/ L5cnnR+hvPhFeHZvPhFD5/ofCccDFPDD/DnN X-Google-Smtp-Source: AMsMyM7Xi8e973ItWkjXXmjGpJZZ02Cfr8fXFo3ByFqv1KEYZeoF0H3UO6Tl91IwIfVoJqsNlfVz+w== X-Received: by 2002:a05:6000:18aa:b0:238:3cb3:1a1d with SMTP id b10-20020a05600018aa00b002383cb31a1dmr2078893wri.409.1667467810085; Thu, 03 Nov 2022 02:30:10 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id n10-20020a05600c4f8a00b003cf77e6091bsm5113171wmq.11.2022.11.03.02.30.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:30:09 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.7 Date: Thu, 3 Nov 2022 09:26:54 +0000 Message-Id: <20221103092758.1099402-36-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.7 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/05/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/f9988e1fd0d149e2277a122cb016ba0c3fbb01a8 Thanks. Luca Boccassi --- >From f9988e1fd0d149e2277a122cb016ba0c3fbb01a8 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 d7a8836293..f217035f33 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -6625,7 +6625,6 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, last_chain_entry->chain_idx = ICE_INVAL_CHAIN_IND; 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); ice_set_bit(entry->rid, rm->r_bitmap); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:27.605008027 +0000 +++ 0036-net-ice-base-fix-array-overflow-in-add-switch-recipe.patch 2022-11-03 09:27:25.393422828 +0000 @@ -1 +1 @@ -From 289b2846c187aa061c13d6a499d0321f581390a5 Mon Sep 17 00:00:00 2001 +From f9988e1fd0d149e2277a122cb016ba0c3fbb01a8 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 d7a8836293..f217035f33 100644 @@ -28 +29 @@ -@@ -7315,7 +7315,6 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, +@@ -6625,7 +6625,6 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm,