Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6876687imu; Thu, 31 Jan 2019 00:54:31 -0800 (PST) X-Google-Smtp-Source: ALg8bN7rDFW7JrS7E4jHUhsFgqXodHuuZHdB9xkJ1huzTR3c1f+asReWovUlBKTShsIpuyWYCe+Q X-Received: by 2002:a62:4c5:: with SMTP id 188mr34385760pfe.130.1548924871534; Thu, 31 Jan 2019 00:54:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548924871; cv=none; d=google.com; s=arc-20160816; b=wd+J45SlVLF3WwhJfVfjKQYULVd0UoG9R/TiahGvfJCU+57u9Rj2IZZyq9fztSSvSg u3+XiDG1uSYkqgAVVpGn66PYS3RmqCRZIRhV0Z0CTfoem6MUnMR+jDvHRdUnjE5m+j0f FEyIQTTS+NWhPz7a+G7gvQVk08Pq+nQBCOBXaQWKif1NoaZ0IScYcvZz9pwUaUKA0/Zm DTa8n8z0Jn/l4anXe3jMihdEVKz77Rfu+Pxpi9pkMohpHSwy/q1mDWLc5cPh3r32fVR6 Aa/TXuvN9Wiim1enMeHiu5xI6RmTooStirlto6uCN+yqhJw2fOv5lUiaYBtZJwEejsMx gx3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=MFQiL94ZAtKCwr10AyzSbwbPvSKmr2kYdFanyXf8hVo=; b=Z0NDHW6o4P9M1pgNANZnUU9Tv1o++6MQsYqwnDjJ8sySAYwjOJUUqtDYv7iC8Se8kp Wd2r3ibvrZm+nQuQ/9w5CvDJZGBHheyyWqx+XrRIgDo8+0JWP25vcDS5Yi0ioXNpl4h7 M7vd2mB428wr++AW84CAMxNrm+n4y9gRDUl011i7stcdPIM8AUmmvLlmBg29l8ELfk/M wrQX4bTRh4KMQZVQtUO7uoq+MUeVGDxfYCAaiTaa/9N0zF4POODct0mMyS1U40P5kOPo YAQsXNcs1lWbr9Dv3BRzMU4ak7f5zOV1BmmPOa9EaSPjwegxKlz9SqlrOC9X4WeyQ6ej iu1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2si4110663pli.266.2019.01.31.00.54.16; Thu, 31 Jan 2019 00:54:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731781AbfAaIxs (ORCPT + 99 others); Thu, 31 Jan 2019 03:53:48 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:52066 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731716AbfAaIxl (ORCPT ); Thu, 31 Jan 2019 03:53:41 -0500 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0V8hvrc093357 for ; Thu, 31 Jan 2019 03:53:40 -0500 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2qbtrfg6r4-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 31 Jan 2019 03:53:39 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 31 Jan 2019 08:53:37 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 31 Jan 2019 08:53:34 -0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x0V8rWiE56492036 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 31 Jan 2019 08:53:32 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6B48242041; Thu, 31 Jan 2019 08:53:32 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F1A9E42042; Thu, 31 Jan 2019 08:53:31 +0000 (GMT) Received: from s38lp84.lnxne.boe (unknown [9.152.108.100]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 31 Jan 2019 08:53:31 +0000 (GMT) From: Michael Mueller To: KVM Mailing List Cc: Linux-S390 Mailing List , linux-kernel@vger.kernel.org, Martin Schwidefsky , Heiko Carstens , Christian Borntraeger , Janosch Frank , David Hildenbrand , Cornelia Huck , Halil Pasic , Pierre Morel , Michael Mueller Subject: [PATCH v7 15/15] KVM: s390: fix possible null pointer dereference in pending_irqs() Date: Thu, 31 Jan 2019 09:52:46 +0100 X-Mailer: git-send-email 2.13.4 In-Reply-To: <20190131085247.13826-1-mimu@linux.ibm.com> References: <20190131085247.13826-1-mimu@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19013108-0028-0000-0000-000003413607 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19013108-0029-0000-0000-000023FF379E Message-Id: <20190131085247.13826-16-mimu@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-31_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=919 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310070 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Assure a GISA is in use before accessing the IPM to avoid a null pointer dereference issue. Signed-off-by: Michael Mueller Reported-by: Halil Pasic --- arch/s390/kvm/interrupt.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index d322400ca587..660ec87b6e60 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -329,9 +329,13 @@ static inline unsigned long pending_irqs_no_gisa(struct kvm_vcpu *vcpu) static inline unsigned long pending_irqs(struct kvm_vcpu *vcpu) { - return pending_irqs_no_gisa(vcpu) | - gisa_get_ipm(vcpu->kvm->arch.gisa_int.origin) << - IRQ_PEND_IO_ISC_7; + struct kvm_s390_gisa_interrupt *gi = &vcpu->kvm->arch.gisa_int; + unsigned long pending_mask; + + pending_mask = pending_irqs_no_gisa(vcpu); + if (gi->origin) + pending_mask |= gisa_get_ipm(gi->origin) << IRQ_PEND_IO_ISC_7; + return pending_mask; } static inline int isc_to_irq_type(unsigned long isc) -- 2.13.4