From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 12E92A0C40;
Sun, 8 Aug 2021 01:13:56 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id AC92A4067E;
Sun, 8 Aug 2021 01:13:55 +0200 (CEST)
Received: from m12-13.163.com (m12-13.163.com [220.181.12.13])
by mails.dpdk.org (Postfix) with ESMTP id 2BCF140140
for <dev@dpdk.org>; Sun, 8 Aug 2021 01:13:53 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com;
s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=jjR3w
HRDOsEPIUjwMvPflwWPGsQA70ImUccZhlccRV0=; b=fZq2uDQfBEprSC4C00TF9
e5ehB9+993GqHluD6Rh1QQhPMnmdN1Fb6QwMZLQPwaB/z9I6GI3cyVxBVNXmUFQV
f6Z/7Kiwl4hkGMNYtx61nvbtXCFW3/2Ro4d2OqK9q70qHtEvRmuOGw5lO0JDba0L
DN+GzeZzo4e4VzX3SlAgKQ=
Received: from DESKTOP-ONA2IA7.localdomain (unknown [39.182.55.95])
by smtp9 (Coremail) with SMTP id DcCowAAXgvJ2Ew9hbaGHOg--.37462S4;
Sun, 08 Aug 2021 07:13:51 +0800 (CST)
From: Gaoxiang Liu <gaoxiangliu0@163.com>
To: Maxime Coquelin <maxime.coquelin@redhat.com>,
Chenbo Xia <chenbo.xia@intel.com>
Cc: dev@dpdk.org, liugaoxiang@huawei.com, Gaoxiang Liu <gaoxiangliu0@163.com>
Date: Sun, 8 Aug 2021 07:12:51 +0800
Message-Id: <20210807231252.660-1-gaoxiangliu0@163.com>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <20210807082504.1432-1-gaoxiangliu0@163.com>
References: <20210807082504.1432-1-gaoxiangliu0@163.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-CM-TRANSID: DcCowAAXgvJ2Ew9hbaGHOg--.37462S4
X-Coremail-Antispam: 1Uf129KBjvJXoW7CF43JF4UtrW5Zw1DCrWfZrb_yoW8uF18pF
y3KF9xJryxJrn5Z39xAF4DXFyrC3Z5ua17G3srG3W5AF4DGws0qayq93WF9r18JFykZFyU
tF1jgF4Y9FWUJw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jaPfQUUUUU=
X-Originating-IP: [39.182.55.95]
X-CM-SenderInfo: xjdr5xxdqjzxjxq6il2tof0z/1tbiWw-nOlSIrFv0KgAAs8
Subject: [dpdk-dev] [PATCH v2] vhost: fix coredump on port deletion
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
The rte_vhost_driver_unregister() and vhost_user_read_cb()
can be called at the same time by 2 threads.
Eg thread1 calls rte_vhost_driver_unregister() and frees memory of conn,
then thread2 calls vhost_user_read_cb() and access invalid memory of
conn.
The fix is to move the "fdset_try_del" in front of free memory of conn ,
then avoid the race condition.
Fixes: 52d874dc6705 ("vhost: fix crash on closing in client mode")
v2:
fix coding style issues
Signed-off-by: Gaoxiang Liu <liugaoxiang@huawei.com>
---
lib/vhost/socket.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
index 5d0d728d5..2eb8fcadd 100644
--- a/lib/vhost/socket.c
+++ b/lib/vhost/socket.c
@@ -1024,6 +1024,20 @@ rte_vhost_driver_unregister(const char *path)
for (i = 0; i < vhost_user.vsocket_cnt; i++) {
struct vhost_user_socket *vsocket = vhost_user.vsockets[i];
+ if (vsocket->is_server) {
+ /*
+ * If r/wcb is executing, release vhost_user's
+ * mutex lock, and try again since the r/wcb
+ * may use the mutex lock.
+ */
+ if (fdset_try_del(&vhost_user.fdset, vsocket->socket_fd) == -1) {
+ pthread_mutex_unlock(&vhost_user.mutex);
+ goto again;
+ }
+ } else if (vsocket->reconnect) {
+ vhost_user_remove_reconnect(vsocket);
+ }
+
if (!strcmp(vsocket->path, path)) {
pthread_mutex_lock(&vsocket->conn_mutex);
for (conn = TAILQ_FIRST(&vsocket->conn_list);
@@ -1056,21 +1070,8 @@ rte_vhost_driver_unregister(const char *path)
pthread_mutex_unlock(&vsocket->conn_mutex);
if (vsocket->is_server) {
- /*
- * If r/wcb is executing, release vhost_user's
- * mutex lock, and try again since the r/wcb
- * may use the mutex lock.
- */
- if (fdset_try_del(&vhost_user.fdset,
- vsocket->socket_fd) == -1) {
- pthread_mutex_unlock(&vhost_user.mutex);
- goto again;
- }
-
close(vsocket->socket_fd);
unlink(path);
- } else if (vsocket->reconnect) {
- vhost_user_remove_reconnect(vsocket);
}
pthread_mutex_destroy(&vsocket->conn_mutex);
--
2.32.0