From patchwork Wed Jan 30 14:49:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Merwick X-Patchwork-Id: 10788727 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE05C6C2 for ; Wed, 30 Jan 2019 14:50:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CCB12F3AA for ; Wed, 30 Jan 2019 14:50:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B2AA2F3B6; Wed, 30 Jan 2019 14:50:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3F2582F3AA for ; Wed, 30 Jan 2019 14:50:43 +0000 (UTC) Received: from localhost ([127.0.0.1]:39337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gorCM-0003bJ-J2 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 Jan 2019 09:50:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gorBF-0002vC-Lp for qemu-devel@nongnu.org; Wed, 30 Jan 2019 09:49:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gorBF-0004x2-0p for qemu-devel@nongnu.org; Wed, 30 Jan 2019 09:49:33 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:38328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gorBE-0004wO-P2 for qemu-devel@nongnu.org; Wed, 30 Jan 2019 09:49:32 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0UEji7r067534; Wed, 30 Jan 2019 14:49:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2018-07-02; bh=kTFk7JNTkPAfUbXgf4maF3rIPFAZxRklOFXKxP83r0Q=; b=ZzLkwgioEXx0Fsbi/xZd0shh/UEKoo6ji7ki/9LEhBo8cAo0zu+7RBncGMR0jmiAYRco U2thz4lXUWY0kTdaf8sA5RTvsG6wL6dFHMdrTcEneWW5HX4plwhUzoQyseuFNlIfu6zf vy5nDiipEirb4xXB+MHNBKRQp7qX4zPVjU83HjPqr38OMDL56MLUsYDiFKp5TOamopTA LqT8BuBCa+QvskDhShQPPNt7UT3GwsMhISWZjDK8JgYRqyGR7S/KvKEwrLJp9Cq0rK26 vKcCvBU/OnDpjHOjUf4EI0F5M32Xyp1fkcbOQqb5gLCkVkorDXbhnrxn/eRJ6pIQP//T 7g== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2q8g6ravnh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jan 2019 14:49:31 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0UEnPRE030016 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jan 2019 14:49:25 GMT Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0UEnOjK009741; Wed, 30 Jan 2019 14:49:24 GMT Received: from ol7.nl.oracle.com (/10.175.63.178) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 30 Jan 2019 06:49:23 -0800 From: Liam Merwick To: rth@twiddle.net, ehabkost@redhat.com, qemu-devel@nongnu.org Date: Wed, 30 Jan 2019 14:49:20 +0000 Message-Id: <1548859760-10654-1-git-send-email-liam.merwick@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9151 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=856 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901300116 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH] kvm: Potential NULL pointer dereference in kvm_arch_init_vcpu() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, mtosatti@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Liam Merwick In kvm_arch_init_vcpu() a call to cpuid_find_entry() can return NULL so the pointer returned should be checked before dereferencing it. Reported by the Parfait static code analysis tool Signed-off-by: Liam Merwick --- target/i386/kvm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 9af4542fb8a8..89fac4a5576c 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1308,7 +1308,9 @@ int kvm_arch_init_vcpu(CPUState *cs) c->ecx = c->edx = 0; c = cpuid_find_entry(&cpuid_data.cpuid, kvm_base, 0); - c->eax = MAX(c->eax, KVM_CPUID_SIGNATURE | 0x10); + if (c) { + c->eax = MAX(c->eax, KVM_CPUID_SIGNATURE | 0x10); + } } cpuid_data.cpuid.nent = cpuid_i;