From patchwork Tue Aug 13 15:10:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 266847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C880E2C014A for ; Wed, 14 Aug 2013 01:26:43 +1000 (EST) Received: from localhost ([::1]:32917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GUb-0007Ne-Nj for incoming@patchwork.ozlabs.org; Tue, 13 Aug 2013 11:26:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GGk-0005IX-Dt for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:12:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9GGb-0003wz-RJ for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:12:22 -0400 Received: from mail-oa0-x22c.google.com ([2607:f8b0:4003:c02::22c]:35481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GGb-0003wl-LW; Tue, 13 Aug 2013 11:12:13 -0400 Received: by mail-oa0-f44.google.com with SMTP id l20so11651209oag.3 for ; Tue, 13 Aug 2013 08:12:13 -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:in-reply-to:references; bh=c27nhBYWNxJ1xyemOWO+FJQyWNzl8fY+buuWGgCyqT8=; b=REtJESmX7Nz2Fmq/NDSvQiSGIH93VP55UMn/4a5ux50nKTLeso+nsJAXDEq8v4q4z7 B9Obunbd5ZwSxmtyosBGO4x31+9YgLVBjH8r2Gp/k2GHPifEdkuiXSbxF81qr8Zm9Wos xUAyQk0LK4dyY4WkZ6k30O6Zicq/UrnUAtfaTKeIGWxt4cLhv5o8Kr48LodxhbNLveom GHA6Dm2fCpH/IdK9S1lZL/MYLWFiuaW6iNsXxLkkug6q0WnPepvVNxf719cqkPt4BnSR xswhO1SlLBjeDqat5Kj+yLhW7leNjGr9R++I9IWs4NMT5mfvA+E4I3VCtWsEZxIs+r3h FniQ== X-Received: by 10.182.101.198 with SMTP id fi6mr668191obb.79.1376406733135; Tue, 13 Aug 2013 08:12:13 -0700 (PDT) Received: from loki.austin.ibm.com ([32.97.110.51]) by mx.google.com with ESMTPSA id uz16sm12947878obc.5.2013.08.13.08.12.11 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 Aug 2013 08:12:12 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2013 10:10:49 -0500 Message-Id: <1376406680-16302-26-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c02::22c Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 25/56] qom: Fix class cast of NULL classes 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 From: Peter Crosthwaite Its clear from the implementation that class casting is supposed to work with a NULL class argument. Guard all dereferences of the class argument against NULL accordingly. Signed-off-by: Peter Crosthwaite Message-id: 94cd5ba46b74eea289a7e582635820c1c54e66fa.1371546907.git.peter.crosthwaite@xilinx.com Signed-off-by: Anthony Liguori (cherry picked from commit 9d6a3d58e4d1431ab3809ff621cfd1f9ec75eef5) Signed-off-by: Michael Roth --- qom/object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qom/object.c b/qom/object.c index 803b94b..b7ecb9f 100644 --- a/qom/object.c +++ b/qom/object.c @@ -531,14 +531,14 @@ ObjectClass *object_class_dynamic_cast_assert(ObjectClass *class, #ifdef CONFIG_QOM_CAST_DEBUG int i; - for (i = 0; i < OBJECT_CLASS_CAST_CACHE; i++) { + for (i = 0; class && i < OBJECT_CLASS_CAST_CACHE; i++) { if (class->cast_cache[i] == typename) { ret = class; goto out; } } #else - if (!class->interfaces) { + if (!class || !class->interfaces) { return class; } #endif @@ -551,7 +551,7 @@ ObjectClass *object_class_dynamic_cast_assert(ObjectClass *class, } #ifdef CONFIG_QOM_CAST_DEBUG - if (ret == class) { + if (class && ret == class) { for (i = 1; i < OBJECT_CLASS_CAST_CACHE; i++) { class->cast_cache[i - 1] = class->cast_cache[i]; }