From nobody Tue Apr 30 07:34:29 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.zoho.com; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494866431340164.33145814172678; Mon, 15 May 2017 09:40:31 -0700 (PDT) Received: from localhost ([::1]:37766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAJ2s-0007Vi-66 for importer@patchew.org; Mon, 15 May 2017 12:40:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAJ1a-0006c0-J6 for qemu-devel@nongnu.org; Mon, 15 May 2017 12:39:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAJ1X-00079H-FA for qemu-devel@nongnu.org; Mon, 15 May 2017 12:39:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34280) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dAJ1X-00078p-9h for qemu-devel@nongnu.org; Mon, 15 May 2017 12:39:07 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2266E800A3 for ; Mon, 15 May 2017 16:39:06 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-54.ams2.redhat.com [10.36.116.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E2157179D4; Mon, 15 May 2017 16:39:05 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 623D51138647; Mon, 15 May 2017 18:39:04 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2266E800A3 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=armbru@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2266E800A3 From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 15 May 2017 18:39:04 +0200 Message-Id: <1494866344-11013-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 15 May 2017 16:39:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] sockets: Plug memory leak in socket_address_flatten() 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" socket_address_flatten() leaks a SocketAddress when its argument is null. Happens when opening a ChardevBackend of type 'udp' that is configured without a local address. Screwed up in commit bd269ebc due to last minute semantic conflict resolution. Spotted by Coverity. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- util/qemu-sockets.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index d8183f7..b39ae74 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1338,12 +1338,14 @@ char *socket_address_to_string(struct SocketAddress= *addr, Error **errp) =20 SocketAddress *socket_address_flatten(SocketAddressLegacy *addr_legacy) { - SocketAddress *addr =3D g_new(SocketAddress, 1); + SocketAddress *addr; =20 if (!addr_legacy) { return NULL; } =20 + addr =3D g_new(SocketAddress, 1); + switch (addr_legacy->type) { case SOCKET_ADDRESS_LEGACY_KIND_INET: addr->type =3D SOCKET_ADDRESS_TYPE_INET; --=20 2.7.4