From patchwork Mon Oct 8 16:05:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 980649 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="MBOPHFKA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42TQFB1hrXz9s8r for ; Tue, 9 Oct 2018 03:05:34 +1100 (AEDT) Received: from localhost ([::1]:47151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9Y2F-000161-PN for incoming@patchwork.ozlabs.org; Mon, 08 Oct 2018 12:05:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9Y0L-0000FV-4g for qemu-devel@nongnu.org; Mon, 08 Oct 2018 12:03:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9Y0J-0007so-Oh for qemu-devel@nongnu.org; Mon, 08 Oct 2018 12:03:33 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:59180) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g9Y0J-0007sW-D8; Mon, 08 Oct 2018 12:03:31 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20181008160329euoutp01cf8e01c21359e8cd26017ac080902dc6~braI2XByy2487724877euoutp016; Mon, 8 Oct 2018 16:03:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20181008160329euoutp01cf8e01c21359e8cd26017ac080902dc6~braI2XByy2487724877euoutp016 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1539014609; bh=/SKj2YJ1whwnuOtAX/4Bxh5jE/Vkaown0P7KgBLyTXc=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=MBOPHFKAoawpSzR5MeGNJXEdO1gGqdpmJPmyd74BoVzn7/NI/vLeegFcZ7tO8c2jQ S7+vRc2Ux8DFraeTnqJO/QtrqOgWs3Rgv1H1yuXhhCQv0AuVrRhW6n4KiEegPZGjly +A5RwQY2XKmJkEJZAp7bc8iZb1OHQ0Pn+uaNnZSw= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181008160329eucas1p275af7249d7d35abfc606f436745dfc34~braIP1yfS2993629936eucas1p2x; Mon, 8 Oct 2018 16:03:29 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 8B.F7.04294.0DF7BBB5; Mon, 8 Oct 2018 17:03:28 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20181008160328eucas1p14fff8e1e5e5f065019353fb86b845340~braHZRVol3093330933eucas1p1r; Mon, 8 Oct 2018 16:03:28 +0000 (GMT) X-AuditID: cbfec7f4-835ff700000010c6-51-5bbb7fd075e2 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id EB.94.04128.0DF7BBB5; Mon, 8 Oct 2018 17:03:28 +0100 (BST) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PGA00GFSF9BGY30@eusync4.samsung.com>; Mon, 08 Oct 2018 17:03:28 +0100 (BST) From: Ilya Maximets To: "Michael S. Tsirkin" Date: Mon, 08 Oct 2018 19:05:36 +0300 Message-id: <20181008160536.6332-3-i.maximets@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20181008160536.6332-1-i.maximets@samsung.com> MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPIsWRmVeSWpSXmKPExsWy7djP87oX6ndHG3zrMLHo3XaP3eJK+092 iwVt7awWxzr3sFj8//WK1eJ47w4Wi/lLd7I4sHs8ubaZyeP9vqtsHn1bVjEGMEdx2aSk5mSW pRbp2yVwZTRP+cdYsIG74sXkZrYGximcXYwcHBICJhIvFst1MXJxCAmsYJT4dv8UK4TzmVHi 9vWNzF2MnGBFmy/MZ4FILGOUePHvOVRVM5PEgS0rwarYBHQkTq0+wghiiwhoSjy99ZoJpIhZ oJFJYu3K+ywgCWEBY4kZVy6zgtgsAqoSVw4dBWvmFbCS2H/pGhvEOnmJ1RsOgMU5Bawl+lpO sULUCEr8mHwPbA4zUM3BK8/BTpIQmMEmMXMGyFCQh1wkXjSrQMwRlnh1fAs7hC0jcXlyNwuE XS9xv+UlI0RvB6PE9EP/mCAS9hJbXp9jh1jAJzFp23RmiJm8Eh1tQhCmh8TyqdYQz/cxSqzY u4B5AqP0LCTnzUJy3gJGplWM4qmlxbnpqcVGeanlesWJucWleel6yfm5mxiB0Xz63/EvOxh3 /Uk6xCjAwajEwzsjb3e0EGtiWXFl7iFGCQ5mJRFe0e27ooV4UxIrq1KL8uOLSnNSiw8xSnOw KInzLpu3MVpIID2xJDU7NbUgtQgmy8TBKdXA2CPie3yyzwx98W0lzIHZKpNOHr3MuluMR6I6 XDck4oKfcOZ2x0Qxk8CNl39VHrstIR0cuOaYQ8C7Nx2NGgd/+B/bEXt8xrGd9cKV9galguZf XQ1DOnu6ZpZtrjwur1rTpamr8Ig33J7Vj+2ybrr92najpQJH7K4wTX3l7XfPS/KdlMe55VJK LMUZiYZazEXFiQAFp5Vs4gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPLMWRmVeSWpSXmKPExsVy+t/xa7oX6ndHG0z9J2jRu+0eu8WV9p/s Fgva2lktjnXuYbH4/+sVq8Xx3h0sFvOX7mRxYPd4cm0zk8f7fVfZPPq2rGIMYI7isklJzcks Sy3St0vgymie8o+xYAN3xYvJzWwNjFM4uxg5OSQETCQ2X5jP0sXIxSEksIRRYlH7R0YIp5VJ Ysv5mcwgVWwCOhKnVh9hBLFFBDQlnt56zQRSxCzQyCSxfNp3sISwgLHEjCuXWUFsFgFViSuH joI18wpYSey/dI0NYp28xOoNB8DinALWEn0tp8DqhYBqFh9YzQJRLyjxY/I9MJsZqP7glecs Exj5ZiFJzUKSWsDItIpRJLW0ODc9t9hIrzgxt7g0L10vOT93EyMwGLcd+7llB2PXu+BDjAIc jEo8vDPydkcLsSaWFVfmHmKU4GBWEuEV3b4rWog3JbGyKrUoP76oNCe1+BCjNAeLkjjveYPK KCGB9MSS1OzU1ILUIpgsEwenVAOjt23Ut/l3Sl6Ef7r1ajfrkqq7f0yna52cuazivmzA66yr QZyqi2aK2zAYpLdzlk86Yeejxi/5nsX7LpPfftmO2rrn9Wyf5vLdXObw+D7/8llSe/bEJX/m cF3I1uVQK/a2+e1PjZ79UnOCxV3+VwpoqUVcs5pirO4hd1/6kOveqe4NCeweB1KVWIozEg21 mIuKEwESXlHgQgIAAA== X-CMS-MailID: 20181008160328eucas1p14fff8e1e5e5f065019353fb86b845340 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181008160328eucas1p14fff8e1e5e5f065019353fb86b845340 References: <20181008160536.6332-1-i.maximets@samsung.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 210.118.77.11 Subject: [Qemu-devel] [RFC 2/2] vhost-user: Fix userfaultfd leak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-stable@nongnu.org, qemu-devel@nongnu.org, Maxime Coquelin , Ilya Maximets , =?utf-8?q?Marc-Andr=C3=A9_Lur?= =?utf-8?q?eau?= , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 'fd' received from the vhost side is never freed. Also, everything (including 'postcopy_listen' state) should be cleaned up on vhost cleanup. Fixes: 46343570c06e ("vhost+postcopy: Wire up POSTCOPY_END notify") Fixes: f82c11165ffa ("vhost+postcopy: Register shared ufd with postcopy") Cc: qemu-stable@nongnu.org Signed-off-by: Ilya Maximets Reviewed-by: Dr. David Alan Gilbert --- hw/virtio/vhost-user.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index c442daa562..e09bed0e4a 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1280,6 +1280,7 @@ static int vhost_user_postcopy_end(struct vhost_dev *dev, Error **errp) return ret; } postcopy_unregister_shared_ufd(&u->postcopy_fd); + close(u->postcopy_fd.fd); u->postcopy_fd.handler = NULL; trace_vhost_user_postcopy_end_exit(); @@ -1419,6 +1420,12 @@ static int vhost_user_backend_cleanup(struct vhost_dev *dev) postcopy_remove_notifier(&u->postcopy_notifier); u->postcopy_notifier.notify = NULL; } + u->postcopy_listen = false; + if (u->postcopy_fd.handler) { + postcopy_unregister_shared_ufd(&u->postcopy_fd); + close(u->postcopy_fd.fd); + u->postcopy_fd.handler = NULL; + } if (u->slave_fd >= 0) { qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL); close(u->slave_fd);