From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeOgv-000233-3U for qemu-devel@nongnu.org; Fri, 11 Mar 2016 10:09:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeOgp-0000Fd-Gj for qemu-devel@nongnu.org; Fri, 11 Mar 2016 10:09:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeOgp-0000FY-BA for qemu-devel@nongnu.org; Fri, 11 Mar 2016 10:09:19 -0500 Date: Fri, 11 Mar 2016 17:09:15 +0200 From: "Michael S. Tsirkin" Message-ID: <1457708548-14093-31-git-send-email-mst@redhat.com> References: <1457708548-14093-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1457708548-14093-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 30/53] qemu-char: make tcp_chr_disconnect() reentrant-safe List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Paolo Bonzini , Eduardo Habkost , =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= From: Marc-Andr=E9 Lureau During CHR_EVENT_CLOSED, the function could be reentered, make this case safe. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- qemu-char.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index 3813efd..27fbb44 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2769,6 +2769,10 @@ static void tcp_chr_disconnect(CharDriverState *ch= r) { TCPCharDriver *s =3D chr->opaque; =20 + if (!s->connected) { + return; + } + s->connected =3D 0; if (s->listen_ioc) { s->listen_tag =3D qio_channel_add_watch( --=20 MST