Message ID | 20160805140241.29513-2-cornelia.huck@de.ibm.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s5T7T25DBz9snm for <incoming@patchwork.ozlabs.org>; Sat, 6 Aug 2016 00:04:05 +1000 (AEST) Received: from localhost ([::1]:45563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1bVfjH-0005st-BY for incoming@patchwork.ozlabs.org; Fri, 05 Aug 2016 10:04:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cornelia.huck@de.ibm.com>) id 1bVfiC-0004nh-Da for qemu-devel@nongnu.org; Fri, 05 Aug 2016 10:03:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <cornelia.huck@de.ibm.com>) id 1bVfi8-00084r-DL for qemu-devel@nongnu.org; Fri, 05 Aug 2016 10:02:55 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:35444) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <cornelia.huck@de.ibm.com>) id 1bVfi8-00084m-3p for qemu-devel@nongnu.org; Fri, 05 Aug 2016 10:02:52 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u75DxZih121773 for <qemu-devel@nongnu.org>; Fri, 5 Aug 2016 10:02:51 -0400 Received: from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 24kkak20c5-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for <qemu-devel@nongnu.org>; Fri, 05 Aug 2016 10:02:51 -0400 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <qemu-devel@nongnu.org> from <cornelia.huck@de.ibm.com>; Fri, 5 Aug 2016 15:02:49 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 5 Aug 2016 15:02:45 +0100 X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: cornelia.huck@de.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3D1581B0805F for <qemu-devel@nongnu.org>; Fri, 5 Aug 2016 15:04:16 +0100 (BST) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u75E2iBQ7209348 for <qemu-devel@nongnu.org>; Fri, 5 Aug 2016 14:02:44 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u75E2hGO002042 for <qemu-devel@nongnu.org>; Fri, 5 Aug 2016 08:02:44 -0600 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-112.boeblingen.de.ibm.com [9.152.224.112]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u75E2hpY002001 (version=TLSv1/SSLv3 cipher=AES256-SHA256 bits=256 verify=NO); Fri, 5 Aug 2016 08:02:43 -0600 From: Cornelia Huck <cornelia.huck@de.ibm.com> To: qemu-devel@nongnu.org Date: Fri, 5 Aug 2016 16:02:41 +0200 X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160805140241.29513-1-cornelia.huck@de.ibm.com> References: <20160805140241.29513-1-cornelia.huck@de.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16080514-0008-0000-0000-000002AD2DAB X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16080514-0009-0000-0000-0000195AD1C9 Message-Id: <20160805140241.29513-2-cornelia.huck@de.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-08-05_10:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608050172 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH for-2.7 1/1] s390x/pci: fix null pointer bug X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Cornelia Huck <cornelia.huck@de.ibm.com>, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, Yi Min Zhao <zyimin@linux.vnet.ibm.com>, agraf@suse.de Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 47ca853..9c1c04e 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -712,7 +712,7 @@ static void s390_pcihost_hot_unplug(HotplugHandler *hotplug_dev, pci_dev = PCI_DEVICE(dev); for (i = 0 ; i < PCI_SLOT_MAX; i++) { - if (s->pbdev[i]->pdev == pci_dev) { + if (s->pbdev[i] && s->pbdev[i]->pdev == pci_dev) { pbdev = s->pbdev[i]; break; }