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 5EC90A0555 for ; Thu, 9 Jun 2022 13:38:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5994040220; Thu, 9 Jun 2022 13:38:00 +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 2E3494281B for ; Thu, 9 Jun 2022 13:37:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774678; 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=onRWYPAskD0130+fTv++gbBmWsU1wcU15YPwTm0DhI8=; b=HVdrwoFoDUx5DP1i7TKC7uGM42noDbWYdOUNbX9G/PhO+gjSs9N5+eoFYoXsPgX8SweuzU vNTzHlxG+xtMQgBl+zZ/YZ7c/FTjdmpGZ0OO8+5bLhXQo63A+B0zeIW/Yt1fGeo/GQOvDo CMWr+pj8zUEeptzRgf76QXkoIPz+hag= 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-586-63E1d5EpPZyGUm7ybkRung-1; Thu, 09 Jun 2022 07:37:57 -0400 X-MC-Unique: 63E1d5EpPZyGUm7ybkRung-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 712551C0CE70; Thu, 9 Jun 2022 11:37:57 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F80D18EAD; Thu, 9 Jun 2022 11:37:56 +0000 (UTC) From: Kevin Traynor To: Joyce Kong Cc: Ferruh Yigit , Ruifeng Wang , dpdk stable Subject: patch 'net/memif: fix overwriting of head segment' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:36:21 +0100 Message-Id: <20220609113701.386938-34-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/277cd2bf752d6f118df705440aa8c33387828df2 Thanks. Kevin --- >From 277cd2bf752d6f118df705440aa8c33387828df2 Mon Sep 17 00:00:00 2001 From: Joyce Kong Date: Wed, 25 May 2022 05:56:35 +0000 Subject: [PATCH] net/memif: fix overwriting of head segment [ upstream commit 10c4c4d4eac1b7def2d2e8a63f9d302cf42a606c ] The 'dst_off' was reset in multi segment case. This caused memif buffer segment to write to beginning of mbuf, overwriting previous data. Fix it with this patch. Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD") Reported-by: Ferruh Yigit Signed-off-by: Joyce Kong Reviewed-by: Ruifeng Wang --- drivers/net/memif/rte_eth_memif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index d3459c5007..205d08b028 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -352,4 +352,5 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) mbuf = mbuf_head; mbuf->port = mq->in_port; + dst_off = 0; next_slot: @@ -358,5 +359,4 @@ next_slot: src_len = d0->length; - dst_off = 0; src_off = 0; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:30.585345710 +0100 +++ 0034-net-memif-fix-overwriting-of-head-segment.patch 2022-06-09 12:34:29.736980625 +0100 @@ -1 +1 @@ -From 10c4c4d4eac1b7def2d2e8a63f9d302cf42a606c Mon Sep 17 00:00:00 2001 +From 277cd2bf752d6f118df705440aa8c33387828df2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 10c4c4d4eac1b7def2d2e8a63f9d302cf42a606c ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 587ad45576..dd951b8296 100644 +index d3459c5007..205d08b028 100644 @@ -25 +26 @@ -@@ -349,4 +349,5 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -352,4 +352,5 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -31 +32 @@ -@@ -355,5 +356,4 @@ next_slot: +@@ -358,5 +359,4 @@ next_slot: