From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7215DC10F0E for ; Thu, 18 Apr 2019 18:11:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EC3F2186A for ; Thu, 18 Apr 2019 18:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555611104; bh=bukiNlZDJ4xlvhCsv6I/IyCGmRL7YDUBJ/K2kF9g/Ns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yxnPw6xTxJLevsGYkSZ5/H7Soh8fOHV2h7EMfel3I/3vu6Nol/fiCfL3DkVD1KbyG fW8UiN+P2YhskjT4062L6bwCNMirjHkiu/ia38NHJpow3GCyhv+5dsjaV0fxoKvXl+ Y0/KgIUIejaJ9bJCXu+nhwZSsxnWlX/EqoyvrTok= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391946AbfDRSLm (ORCPT ); Thu, 18 Apr 2019 14:11:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:43942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391003AbfDRSLk (ORCPT ); Thu, 18 Apr 2019 14:11:40 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8D27D206B6; Thu, 18 Apr 2019 18:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555611099; bh=bukiNlZDJ4xlvhCsv6I/IyCGmRL7YDUBJ/K2kF9g/Ns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k2ufAqcOCXt4+lEv6/0NO3REVDTACri80EJyfX25KL5AE2kDWNOHbDp9czRJFG15q Lgnjz/RhWzLYJnrzRJq2+wbE03CLnXpPqILp/GNykM9c8Ug6hwWz3OO9eYnCnZEiVN ccbTSGadPkYC/u/2JP2S7gdK1qYuDClIPWjcO3Xc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Thomas Gleixner , Mukesh Ojha , "K. Y. Srinivasan" , pakki001@umn.edu, Haiyang Zhang , Stephen Hemminger , Sasha Levin , Borislav Petkov , "H. Peter Anvin" , linux-hyperv@vger.kernel.org Subject: [PATCH 5.0 57/93] x86/hyperv: Prevent potential NULL pointer dereference Date: Thu, 18 Apr 2019 19:57:35 +0200 Message-Id: <20190418160443.309017791@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160436.781762249@linuxfoundation.org> References: <20190418160436.781762249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 534c89c22e26b183d838294f0937ee092c82ad3a ] The page allocation in hv_cpu_init() can fail, but the code does not have a check for that. Add a check and return -ENOMEM when the allocation fails. [ tglx: Massaged changelog ] Signed-off-by: Kangjie Lu Signed-off-by: Thomas Gleixner Reviewed-by: Mukesh Ojha Acked-by: "K. Y. Srinivasan" Cc: pakki001@umn.edu Cc: Haiyang Zhang Cc: Stephen Hemminger Cc: Sasha Levin Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: linux-hyperv@vger.kernel.org Link: https://lkml.kernel.org/r/20190314054651.1315-1-kjlu@umn.edu Signed-off-by: Sasha Levin --- arch/x86/hyperv/hv_init.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index d3f42b6bbdac..8a9cff1f129d 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -102,9 +102,13 @@ static int hv_cpu_init(unsigned int cpu) u64 msr_vp_index; struct hv_vp_assist_page **hvp = &hv_vp_assist_page[smp_processor_id()]; void **input_arg; + struct page *pg; input_arg = (void **)this_cpu_ptr(hyperv_pcpu_input_arg); - *input_arg = page_address(alloc_page(GFP_KERNEL)); + pg = alloc_page(GFP_KERNEL); + if (unlikely(!pg)) + return -ENOMEM; + *input_arg = page_address(pg); hv_get_vp_index(msr_vp_index); -- 2.19.1