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 A7B3EA0540 for ; Thu, 7 Jul 2022 09:57:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A2E69406B4; Thu, 7 Jul 2022 09:57:36 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id EF29B41147 for ; Thu, 7 Jul 2022 09:57:34 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 6E2604001E for ; Thu, 7 Jul 2022 07:57:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180654; bh=nxTutSeEQP1qKh7Ev1zV/S+ldesZ2oK7Drq47gp3S6Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S3Itwrw0WqH7Z+w3dGK7GSVmVWRUdQRP4zRVZKGxqM5fTkARh3RfjnusiOkDyqyhU DHY6HuxrlcPUH6qd8nyvY4nW27lwG81cyx6X+e/XAyV/koq3K2TqX0YH6AB6tGlXXg btpCb5B6wdwA81UAVll47qXuKuHDtrF7DfdHLHex2TppglbI0tXHwu+J5n8PO6ywmI VaA56d268IUPjbUza+ucPu8pTvQCCM9C1B1EbY1FcKZdH32NcucXCJ1NvS9FMdJlwm HtQZTr4MeRMBn30K/xxZ6WyJGT0TMk/oL7DV1bDwLkhbEDZOtmjIXlM+W5S0tdyNzd +IMRsJ39Y8U2g== Received: by mail-ed1-f69.google.com with SMTP id x21-20020a05640226d500b00435bd7f9367so13325556edd.8 for ; Thu, 07 Jul 2022 00:57:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nxTutSeEQP1qKh7Ev1zV/S+ldesZ2oK7Drq47gp3S6Y=; b=RiUBFJrQoc96+lxSuZq0YZSPwir1KYVpT6bfdcRcPVXqqGDGqWKb7T3JccyC6wSB3G eWbbc0AEHGZNGJ6+ueiMWZMnNEalWaLFfdEmASpyKkuvJzenPb+mdMgQac24dSWzeOd2 ho43lcmcn8biz2DZx4lGUvJoyu/+xBEPYODIDbGWcLnk9h96fn7vKFMEwjYuXPgDfh2q Mrawyei9zmZMc42IrTfqsd7yUalUydedysP7+/1Qw80UzsupEPDXLrZMu5+3GRqSrkp6 0Qxk73Z8B0/9e9wiZxk6xgvzglg5ZxEKWIuloyw9JkHu0xqweSQRtTUiqyj8yf8fV9+x wdoA== X-Gm-Message-State: AJIora+oZRYpOKda5KhDcobZGifeZ/tdaXrQdqI+RznQUdtTdNiF99Rk jhOlTfOmhqh808V4HhhdOwXe5OYFosNiGS0dnvaIo+8IdZOV6ao3aESNhhXDF+ZhB0LqEvbHzRL ocCkSzHa2zxqe4DjB4siVjAb9 X-Received: by 2002:a05:6402:11c7:b0:437:67eb:f144 with SMTP id j7-20020a05640211c700b0043767ebf144mr59746991edw.84.1657180653606; Thu, 07 Jul 2022 00:57:33 -0700 (PDT) X-Google-Smtp-Source: AGRyM1thclQeFUy5co/accZ1m3YUqkTBkidG0xbKb0m1gGpK3lneyUiabJmXQ+PPECj1EAv/6nMn3A== X-Received: by 2002:a05:6402:11c7:b0:437:67eb:f144 with SMTP id j7-20020a05640211c700b0043767ebf144mr59746963edw.84.1657180653370; Thu, 07 Jul 2022 00:57:33 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id g15-20020a056402320f00b0043a85d7d15esm3756357eda.12.2022.07.07.00.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:57:32 -0700 (PDT) From: christian.ehrhardt@canonical.com 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 19.11.13 Date: Thu, 7 Jul 2022 09:54:37 +0200 Message-Id: <20220707075522.194223-42-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/8abcce84f2eece557cbc254dd83c2bac9a7d137a Thanks. Christian Ehrhardt --- >From 8abcce84f2eece557cbc254dd83c2bac9a7d137a 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 fddf84a8fd..10aebadbd0 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -334,13 +334,13 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) goto no_free_bufs; mbuf = mbuf_head; mbuf->port = mq->in_port; + dst_off = 0; next_slot: s0 = cur_slot & mask; d0 = &ring->desc[s0]; src_len = d0->length; - dst_off = 0; src_off = 0; do { -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:12.960499353 +0200 +++ 0042-net-memif-fix-overwriting-of-head-segment.patch 2022-07-07 09:54:10.913824296 +0200 @@ -1 +1 @@ -From 10c4c4d4eac1b7def2d2e8a63f9d302cf42a606c Mon Sep 17 00:00:00 2001 +From 8abcce84f2eece557cbc254dd83c2bac9a7d137a 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 fddf84a8fd..10aebadbd0 100644 @@ -25 +26 @@ -@@ -348,13 +348,13 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -334,13 +334,13 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)