From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 16980A2E1B for ; Thu, 5 Sep 2019 12:19:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 00C8E1EFA0; Thu, 5 Sep 2019 12:19:33 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8799F1EF99 for ; Thu, 5 Sep 2019 12:19:31 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F2377301A893; Thu, 5 Sep 2019 10:19:30 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0DE319C77; Thu, 5 Sep 2019 10:19:29 +0000 (UTC) From: Kevin Traynor To: Xiao Zhang Cc: Xiaolong Ye , dpdk stable Date: Thu, 5 Sep 2019 11:17:46 +0100 Message-Id: <20190905101754.21933-46-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Thu, 05 Sep 2019 10:19:31 +0000 (UTC) Subject: [dpdk-stable] patch 'net/fm10k: fix address of first segment' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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 09/12/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/d78c697610e3bb55641059113677ec10c59baf90 Thanks. Kevin Traynor --- >From d78c697610e3bb55641059113677ec10c59baf90 Mon Sep 17 00:00:00 2001 From: Xiao Zhang Date: Tue, 6 Aug 2019 07:20:54 +0800 Subject: [PATCH] net/fm10k: fix address of first segment [ upstream commit 1c38061e790fc3f28d77eb7ded6cb8601c7c6692 ] This patch fixes (dereference after null check) coverity issue. The address of first segmented packets was not set correctly during reassembling packets which led to this issue. Coverity issue: 343416 Fixes: fe65e1e1ce61 ("fm10k: add vector scatter Rx") Signed-off-by: Xiao Zhang Acked-by: Xiaolong Ye --- drivers/net/fm10k/fm10k_rxtx_vec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c index 788e2484a..45542bef3 100644 --- a/drivers/net/fm10k/fm10k_rxtx_vec.c +++ b/drivers/net/fm10k/fm10k_rxtx_vec.c @@ -679,4 +679,5 @@ fm10k_recv_scattered_pkts_vec(void *rx_queue, if (i == nb_bufs) return nb_bufs; + rxq->pkt_first_seg = rx_pkts[i]; } return i + fm10k_reassemble_packets(rxq, &rx_pkts[i], nb_bufs - i, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:50.286934706 +0100 +++ 0046-net-fm10k-fix-address-of-first-segment.patch 2019-09-05 10:36:47.551699541 +0100 @@ -1 +1 @@ -From 1c38061e790fc3f28d77eb7ded6cb8601c7c6692 Mon Sep 17 00:00:00 2001 +From d78c697610e3bb55641059113677ec10c59baf90 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1c38061e790fc3f28d77eb7ded6cb8601c7c6692 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org