Received: from eggs.gnu.org ([2001:4830:134:3::10]:37699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi589-0005Gl-Dm for qemu-devel@nongnu.org; Wed, 07 May 2014 12:55:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wi585-0006lO-16 for qemu-devel@nongnu.org; Wed, 07 May 2014 12:55:41 -0400 From: Markus Armbruster References: <1399422257-5912-1-git-send-email-pl@kamp.de> <5369A2E2.3010604@redhat.com> <536A404D.9090000@kamp.de> Date: Wed, 07 May 2014 18:55:26 +0200 In-Reply-To: <536A404D.9090000@kamp.de> (Peter Lieven's message of "Wed, 07 May 2014 16:16:45 +0200") Message-ID: <874n11wmtd.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH] qapi: fix null pointer dereference on invalid parameter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Lieven Cc: qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, qemu-stable@nongnu.org, Paolo Bonzini , lcapitulino@redhat.com Peter Lieven writes: > On 07.05.2014 05:05, Eric Blake wrote: >> On 05/06/2014 06:24 PM, Peter Lieven wrote: >>> qemu segfaults if it receives an invalid parameter via a >>> qmp command instead of throwing an error. >>> >>> For example: >>> { "execute": "blockdev-add", >>> "arguments": { "options" : { "driver": "invalid-driver" } } } >>> >>> CC: qemu-stable@nongnu.org >>> Signed-off-by: Peter Lieven >>> --- >>> qapi/qapi-dealloc-visitor.c | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >> Does this overlap with any of Markus' work? It emphasizes how bad it is >> that our visitor interface callbacks are undocumented on what they can >> be passed and are expected to return. >> >> https://lists.gnu.org/archive/html/qemu-devel/2014-05/msg00225.html >> >>> diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c >>> index d0ea118..dc53545 100644 >>> --- a/qapi/qapi-dealloc-visitor.c >>> +++ b/qapi/qapi-dealloc-visitor.c >>> @@ -131,7 +131,9 @@ static void qapi_dealloc_end_list(Visitor *v, Error **errp) >>> static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name, >>> Error **errp) >>> { >>> - g_free(*obj); >>> + if (obj) { >>> + g_free(*obj); >>> + } >>> } >> As for solving a crash, >> Reviewed-by: Eric Blake >> >> But if Markus' cleanups solve the problem by guaranteeing that the >> cleanup visitor is never passed a NULL obj, then this would be a dead >> check. I'm not familiar enough with the rest of the visitor code to >> know whether the caller is at fault, or whether other callers or visitor >> callbacks have the same bug. >> > > > Markus, can you advise please. My series doesn't address this problem, and I can in fact reproduce the crash with it applied. Your fix effectively reverts my commit 25a7017. Let's turn it into a proper revert: Revert "qapi: Clean up superfluous null check in qapi_dealloc_type_str()" This reverts commit 25a7017555f1b4aeb543b5d323ff4afb8f9c5437. Turns out the argument *can* be null: QEMU now segfaults if it receives an invalid parameter via a qmp command instead of throwing an error. For example: { "execute": "blockdev-add", "arguments": { "options" : { "driver": "invalid-driver" } } } CC: qemu-stable@nongnu.org Signed-off-by: Peter Lieven Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster The deallocation visitor is more special than I (naively) thought...