From nobody Wed May 1 10:36:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526919550559538.8687510427542; Mon, 21 May 2018 09:19:10 -0700 (PDT) Received: from localhost ([::1]:51482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKnWX-00028w-Lw for importer@patchew.org; Mon, 21 May 2018 12:19:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44507) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKnVf-0001pI-4W for qemu-devel@nongnu.org; Mon, 21 May 2018 12:18:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKnVa-0007A1-Fx for qemu-devel@nongnu.org; Mon, 21 May 2018 12:18:06 -0400 Received: from forward105o.mail.yandex.net ([2a02:6b8:0:1a2d::608]:46550) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fKnVa-00078V-3U for qemu-devel@nongnu.org; Mon, 21 May 2018 12:18:02 -0400 Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward105o.mail.yandex.net (Yandex) with ESMTP id E1CBD444290B; Mon, 21 May 2018 19:17:58 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id CeYP1Z2UUd-HwRWkWOw; Mon, 21 May 2018 19:17:58 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id UthPHQKV3G-Hvs01UHA; Mon, 21 May 2018 19:17:57 +0300 (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=void.so; s=mail; t=1526919478; bh=qp4NaTNCdl5r8GPl+NqB/dRQEfucHAIzRTyKVz8JEZI=; h=Date:From:To:Cc:Subject:Message-ID; b=NYw/gtRaFAidBBnh1L3psNIctaULbLRkgV19pOiiRTsn0aOT8jF6GvaOmd+CpywVL C/lzc2N0U/G7chnKafB5Mf6Pmdv98OGPsz55DoQtYlAPwNp62Bo6+HiIGBvpRvIRVC b0hZf1nnlOyxJYMT+nU2xc4WFFYfoo/CMmVmkCJQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=void.so; s=mail; t=1526919477; bh=qp4NaTNCdl5r8GPl+NqB/dRQEfucHAIzRTyKVz8JEZI=; h=Date:From:To:Cc:Subject:Message-ID; b=rehf4XdMwklGwlsOP1yP6BcjCYiNEece8ZgsrNjtBdI5NF7hFMrQXSQHH4HzBIwOa oGfNbWuRICGE6GtC54EOeXBngZFNjZ5LvFC7l5RRMdcO1lK9OvNkd+LQH1wXF3VboH fV9+aW/df9wrPdO1yB/+g0SNtGBGt0RBLns6KDAQ= Authentication-Results: smtp1p.mail.yandex.net; dkim=pass header.i=@void.so Date: Mon, 21 May 2018 19:17:35 +0300 From: Pavel Balaev To: berrange@redhat.com Message-ID: <20180521161733.GA16751@rnd> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.5 (2018-04-13) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a02:6b8:0:1a2d::608 Subject: [Qemu-devel] [PATCH v2] Delete AF_UNIX socket after close 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-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is a second attempt at sending this patch: http://lists.nongnu.org/archive/html/qemu-devel/2018-05/msg04697.html Signed-off-by: Pavel Balaev --- io/channel-socket.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/io/channel-socket.c b/io/channel-socket.c index 57cfb4d3a6..b50e63a053 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -685,8 +685,10 @@ qio_channel_socket_close(QIOChannel *ioc, Error **errp) { QIOChannelSocket *sioc =3D QIO_CHANNEL_SOCKET(ioc); + int rc =3D 0; =20 if (sioc->fd !=3D -1) { + SocketAddress *addr =3D socket_local_address(sioc->fd, errp); #ifdef WIN32 WSAEventSelect(sioc->fd, NULL, 0); #endif @@ -697,8 +699,22 @@ qio_channel_socket_close(QIOChannel *ioc, return -1; } sioc->fd =3D -1; + + if (addr && addr->type =3D=3D SOCKET_ADDRESS_TYPE_UNIX + && addr->u.q_unix.path) { + if (unlink(addr->u.q_unix.path) < 0 && errno !=3D ENOENT) { + error_setg_errno(errp, errno, + "Failed to unlink socket %s", + addr->u.q_unix.path); + rc =3D -1; + } + } + + if (addr) { + qapi_free_SocketAddress(addr); + } } - return 0; + return rc; } =20 static int --=20 2.16.1