From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4tWv-0004vi-6F for qemu-devel@nongnu.org; Thu, 10 Nov 2016 12:52:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4tWu-0003N6-CS for qemu-devel@nongnu.org; Thu, 10 Nov 2016 12:52:53 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:32787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c4tWu-0003Mq-64 for qemu-devel@nongnu.org; Thu, 10 Nov 2016 12:52:52 -0500 Received: by mail-wm0-x243.google.com with SMTP id u144so4594301wmu.0 for ; Thu, 10 Nov 2016 09:52:52 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 10 Nov 2016 18:52:40 +0100 Message-Id: <1478800362-18138-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1478800362-18138-1-git-send-email-pbonzini@redhat.com> References: <1478800362-18138-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 4/6] qdev: fix use-after-free regression from becdfa00cfa List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-André Lureau Spotted by Coverity, CID 1365383. Signed-off-by: Marc-André Lureau Message-Id: <20161107095922.31676-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- hw/core/qdev-properties-system.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index c35f0f5..1b7ea50 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -200,18 +200,14 @@ static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque, } s = qemu_chr_find(str); - g_free(str); if (s == NULL) { error_setg(errp, "Property '%s.%s' can't find value '%s'", object_get_typename(obj), prop->name, str); - return; - } - - if (!qemu_chr_fe_init(be, s, errp)) { + } else if (!qemu_chr_fe_init(be, s, errp)) { error_prepend(errp, "Property '%s.%s' can't take value '%s': ", object_get_typename(obj), prop->name, str); - return; } + g_free(str); } static void release_chr(Object *obj, const char *name, void *opaque) -- 1.8.3.1