From patchwork Tue Jun 18 14:16:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 252359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 09BAA2C00B1 for ; Wed, 19 Jun 2013 00:18:25 +1000 (EST) Received: from localhost ([::1]:55867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uowjm-0001Pi-D9 for incoming@patchwork.ozlabs.org; Tue, 18 Jun 2013 10:18:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uowil-0000Oy-Fa for qemu-devel@nongnu.org; Tue, 18 Jun 2013 10:17:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uowig-0001Qd-P0 for qemu-devel@nongnu.org; Tue, 18 Jun 2013 10:17:19 -0400 Received: from mail-wg0-x234.google.com ([2a00:1450:400c:c00::234]:51088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uowig-0001QW-K8; Tue, 18 Jun 2013 10:17:14 -0400 Received: by mail-wg0-f52.google.com with SMTP id b12so3538334wgh.7 for ; Tue, 18 Jun 2013 07:17: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:x-mailer:in-reply-to :references; bh=9wr9LZytgVAAZWmFZL1N/S+ovqxMmH6zEYV/WS/rDQY=; b=JqVdbE10UdYotwvH4mleAiGo4izvrFP5X9lVoG82V+P1ZfItSDSmrHbcP3ZT34SZ5m VIewi3+B18efoDfMoipRzHjRSMpLOTwkt8gdKxHDqfohmyASBF+iK0rWMPQtuEy8ORaX R1kKfOcuqh3Ej6Ml33glyfOysU5EJDqKaZqvt+9JPjd3hmEuubpOuJgU/30IgMz+l600 0jXURnkT9l5gMf/GrRzB2KDshnd2NjePmMX2anruEw5CBR8MoXClVPJerfukypvFmDyE xwd/9VVoynsYvmhFP9Jrbmj/39Il02uqbO6fiGeP21opT49IJZczCmfJxB5zHBU/U/ob 8O8Q== X-Received: by 10.194.174.137 with SMTP id bs9mr10907570wjc.59.1371565033900; Tue, 18 Jun 2013 07:17:13 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id o14sm2385861wiv.3.2013.06.18.07.17.11 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 18 Jun 2013 07:17:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 18 Jun 2013 16:16:54 +0200 Message-Id: <1371565016-2643-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1371565016-2643-1-git-send-email-pbonzini@redhat.com> References: <1371565016-2643-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::234 Cc: Asias He , Nicholas Bellinger , mdroth@linux.vnet.ibm.com, Stefan Hajnoczi , qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 5/7] vhost-scsi: fix k->set_guest_notifiers() NULL dereference 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: Stefan Hajnoczi Coverity picked up a copy-paste bug. In vhost_scsi_start() we check for !k->set_guest_notifiers and error out. The check probably got copied but instead of erroring we actually use the function pointer! Cc: Nicholas Bellinger Cc: Asias He Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- hw/scsi/vhost-scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index d7a1c33..785e93f 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -123,7 +123,7 @@ static void vhost_scsi_stop(VHostSCSI *s) VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); int ret = 0; - if (!k->set_guest_notifiers) { + if (k->set_guest_notifiers) { ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false); if (ret < 0) { error_report("vhost guest notifier cleanup failed: %d\n", ret);