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 2F702A054A for ; Tue, 25 Oct 2022 17:09:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2BF5742C49; Tue, 25 Oct 2022 17:09:23 +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 ED53E42C1D for ; Tue, 25 Oct 2022 17:09:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710561; 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=7g8uU7x62kVAjNQhBUQDQTxIJCjIJVhLiJyNRNKRFus=; b=PDoNF+39Y1t1lYlsq2aQRwf2ggEa3jU3k4E6WZhbc+rHpooNq7+B+QLUD+bIbS/R4zepaM 6fkRaJWqJ/wbRcDjLxmAx8Ea9GxT+X+V1QuNCgX+X3bxcK57EwaebTbYxWY7Pnh4oMVOw8 6VKxqLCzglozh8K190ipsNOi5u0hg8o= 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-570-xRNXKa5ANte94D-nd3KcOA-1; Tue, 25 Oct 2022 11:09:18 -0400 X-MC-Unique: xRNXKa5ANte94D-nd3KcOA-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 73B0784ACA3; Tue, 25 Oct 2022 15:09:16 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53DB24B4011; Tue, 25 Oct 2022 15:09:15 +0000 (UTC) From: Kevin Traynor To: Qi Zhang Cc: Junfeng Guo , Qiming Yang , dpdk stable Subject: patch 'net/ice/base: fix bit finding range over ptype bitmap' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:51 +0100 Message-Id: <20221025150734.142189-56-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/f1ac3e709008a36b806ca04e83d95dbd70134632 Thanks. Kevin --- >From f1ac3e709008a36b806ca04e83d95dbd70134632 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 15 Aug 2022 03:31:26 -0400 Subject: [PATCH] net/ice/base: fix bit finding range over ptype bitmap [ upstream commit ac549a3249172cbef3417cf53e6ff35f0ca1de65 ] The 2nd argument to function ice_find_first_bit is the bitmap size, (in bits) not a mask. Thus, use of UINT16_MAX or 0xFFFF will allow a potential run off the end of the ptype array. Also, the ptype bitmap (i.e., prof->ptypes) is declared with size ICE_FLOW_PTYPE_MAX, thus finding the bits within this bitmap should not exceed this bound. Fixes: 8ebb93942b2c ("net/ice/base: add function to set HW profile for raw flow") Signed-off-by: Junfeng Guo Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c index 0db474bd62..554e9bc8ef 100644 --- a/drivers/net/ice/base/ice_flow.c +++ b/drivers/net/ice/base/ice_flow.c @@ -2547,5 +2547,5 @@ ice_flow_set_hw_prof(struct ice_hw *hw, u16 dest_vsi_handle, enum ice_block blk) { - int id = ice_find_first_bit(prof->ptypes, UINT16_MAX); + int id = ice_find_first_bit(prof->ptypes, ICE_FLOW_PTYPE_MAX); struct ice_flow_prof_params *params; u8 fv_words = hw->blk[blk].es.fvw; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:59.806264467 +0100 +++ 0056-net-ice-base-fix-bit-finding-range-over-ptype-bitmap.patch 2022-10-25 14:18:58.436798181 +0100 @@ -1 +1 @@ -From ac549a3249172cbef3417cf53e6ff35f0ca1de65 Mon Sep 17 00:00:00 2001 +From f1ac3e709008a36b806ca04e83d95dbd70134632 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ac549a3249172cbef3417cf53e6ff35f0ca1de65 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 54181044f1..b196e51276 100644 +index 0db474bd62..554e9bc8ef 100644 @@ -27 +28 @@ -@@ -2562,5 +2562,5 @@ ice_flow_set_hw_prof(struct ice_hw *hw, u16 dest_vsi_handle, +@@ -2547,5 +2547,5 @@ ice_flow_set_hw_prof(struct ice_hw *hw, u16 dest_vsi_handle,