From patchwork Fri Oct 19 02:42:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 192512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 775732C009A for ; Fri, 19 Oct 2012 14:47:41 +1100 (EST) Received: from localhost ([::1]:58631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2ZG-0006vq-SC for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 22:44:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42573) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Xz-0004KE-I7 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TP2Xy-0002qc-BR for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:51 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:58994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Xy-0002eS-6A for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:50 -0400 Received: by mail-ob0-f173.google.com with SMTP id wc18so3049obb.4 for ; Thu, 18 Oct 2012 19:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=a/jdIvYuFUWc2Bhe24Ts0/4v6JKeqM9Ne2QMo80pyI4=; b=pJwgoNdsWKMHaDGWyYsuMizKsWNBQO5c7ZRzPUCSLxiwmXbIrMHyzoRt260/Bnt151 gu5WOxcIA1sBh+RUYz5wiNpRc4Avti2rh5VTJov9nWO7DdWtgJCqIBLYw3sWDMU75LGK ZGYCZDsa+76KkwXTCAxBjOeTuEQDDrXcfj3nV05BMvc1ESGd6P4/6MNtlxGmANasbviv qVHvh1lt05X6J80DUond/Bs5hujNkF2z9iOglUTaBihbK3+XzzjiS323V0Ss/H/GDB3N 8KXSU9bbG0RJPT7Xm+iu7ClTZYZFCX/e3VKUVvby3G5RkNCqxY6eQPx1kINYFM6G1ite 5tJw== Received: by 10.60.32.210 with SMTP id l18mr21198064oei.79.1350614569766; Thu, 18 Oct 2012 19:42:49 -0700 (PDT) Received: from loki.austin.ibm.com ([32.97.110.59]) by mx.google.com with ESMTPS id m6sm475144obk.3.2012.10.18.19.42.48 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 19:42:49 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 21:42:06 -0500 Message-Id: <1350614540-28583-13-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350614540-28583-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1350614540-28583-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 12/26] qapi: fix potential segfault for visit_type_size() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org visit_type_size() was added for use-cases currently only encountered by OptsVisitor users, which implements a specific handler for visit_type_size(). For Visitor implementations that don't implement the handler, we fallback to using v->type_uint64(). However, some visitor implementations, such as Qmp*Visitor, also rely on fallback code to handle visit_type_uint64() calls, and leave v->type_uint64 unset. This leads to a segfault when we try to use visit_type_size(). Fix this by calling the visit_type_uint64() function in visit_type_size()'s fallback instead of calling v->type_uint64() directly. Signed-off-by: Michael Roth --- qapi/qapi-visit-core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 9a74ed0..dd28cb9 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -237,7 +237,11 @@ void visit_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp) void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp) { if (!error_is_set(errp)) { - (v->type_size ? v->type_size : v->type_uint64)(v, obj, name, errp); + if (v->type_size) { + v->type_size(v, obj, name, errp); + } else { + visit_type_uint64(v, obj, name, errp); + } } }