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 9441DA04B1 for ; Fri, 28 Aug 2020 12:14:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8D2201C10A; Fri, 28 Aug 2020 12:14:02 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 34CFE1C10A for ; Fri, 28 Aug 2020 12:14:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609640; 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=KJnyObHUpmTHOrvEQlADdaDmO1UFPDlNsbvbMeQe2Os=; b=VerDy7fjkKLpYOWZ2GRLHDYUTGC43bjc0cy/WftJxUu/9rbuOwHKOuf73lD2Ay6dsFHNmJ iLi6/sQ7kUQUkBnUM9PA+Y3cZIok+HdJnnj7Z6G1FyBOaSda+kturlj03/3JR9sCsOg1KK GK5VX+E+YBJErspsl2N0W4Ll2QPgsoE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-187-Q7iTNvSGOpCiWyfNt8eVEQ-1; Fri, 28 Aug 2020 06:13:56 -0400 X-MC-Unique: Q7iTNvSGOpCiWyfNt8eVEQ-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8D42807337; Fri, 28 Aug 2020 10:13:55 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C81D19D7C; Fri, 28 Aug 2020 10:13:51 +0000 (UTC) From: Kevin Traynor To: Patrick Fu Cc: Maxime Coquelin , dpdk stable Date: Fri, 28 Aug 2020 11:12:40 +0100 Message-Id: <20200828101308.223767-14-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix double-free with zero-copy' has been queued to LTS release 18.11.10 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.10 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/02/20. 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/59b99c4c9c48e0c80c72bf105c7f7dbd7f35c040 Thanks. Kevin. --- >From 59b99c4c9c48e0c80c72bf105c7f7dbd7f35c040 Mon Sep 17 00:00:00 2001 From: Patrick Fu Date: Tue, 21 Jul 2020 12:10:57 +0000 Subject: [PATCH] vhost: fix double-free with zero-copy [ upstream commit a608436b635460c1be0d0d561838aa197cf32c87 ] zmbufs should be set to NULL when getting freed to avoid double free on the same buffer pointer Fixes: b0a985d1f340 ("vhost: add dequeue zero copy") Signed-off-by: Patrick Fu Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_user.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index c88275c24f..2a6a23c4b2 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1396,4 +1396,5 @@ free_zmbufs(struct vhost_virtqueue *vq) rte_free(vq->zmbufs); + vq->zmbufs = NULL; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.304967569 +0100 +++ 0014-vhost-fix-double-free-with-zero-copy.patch 2020-08-28 11:03:25.942955602 +0100 @@ -1 +1 @@ -From a608436b635460c1be0d0d561838aa197cf32c87 Mon Sep 17 00:00:00 2001 +From 59b99c4c9c48e0c80c72bf105c7f7dbd7f35c040 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a608436b635460c1be0d0d561838aa197cf32c87 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index df0db8a07d..9ddeae3622 100644 +index c88275c24f..2a6a23c4b2 100644 @@ -22 +23 @@ -@@ -1935,4 +1935,5 @@ free_zmbufs(struct vhost_virtqueue *vq) +@@ -1396,4 +1396,5 @@ free_zmbufs(struct vhost_virtqueue *vq)