From patchwork Fri Oct 12 21:10:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 191239 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 05FA12C0090 for ; Sat, 13 Oct 2012 09:21:10 +1100 (EST) Received: from localhost ([::1]:38847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMmXF-0007tt-DQ for incoming@patchwork.ozlabs.org; Fri, 12 Oct 2012 17:12:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMmWC-0005jc-8V for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMmWB-000602-9Q for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:40 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:36593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMmWB-0005iK-4O for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:39 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so5335456iea.4 for ; Fri, 12 Oct 2012 14:11:38 -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=nj8e8QoxJkZoeC5R1PL3OB2Irfuc5NDthZCQTw3EgLpsG5D9Lpa3icJ7nXvgq6mKAI Vqg32BzwsdMG4iYDXOmRCUIlWefp2vHIrRjwe2OMaD4PYicSwcvEysoercPse5IWHZFh 0tW9DGjKizMiWTjrQU0j0Moc0UHCvJIIIjIs5O9KcfGkR8w9yPHOEyUr1a8/rah9wwUn mxnAWsgw00jTuC887jPOUxi0A64zX7nbj5QaLcQiukcjCMbBTmdnA1qJcH95YNnN8vCP 9uWfwDhocm6y/Zhyh39cyx4x+8nl+8yJTB7dLWG32DIb2QIJzJpzTr9R9P+a+woLV809 4gLw== Received: by 10.50.56.139 with SMTP id a11mr3407370igq.3.1350076298599; Fri, 12 Oct 2012 14:11:38 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id uj11sm2454777igb.15.2012.10.12.14.11.37 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 12 Oct 2012 14:11:38 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 12 Oct 2012 16:10:54 -0500 Message-Id: <1350076268-18461-13-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350076268-18461-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1350076268-18461-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.223.173 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v4 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); + } } }