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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 9463CC4363D for ; Mon, 5 Oct 2020 23:37:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4CA33206F7 for ; Mon, 5 Oct 2020 23:37:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601941071; bh=alrgM9k5I/Vja+EvD0IFWV5aNvNpxkYLyuOosw+D8lY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=a9yXnWpZl0JX01a6AkCxEtCcLZJawuMb3/EQ6wggyst2LjuvR0ipekPagFwTJ6sJQ 2tBZ6M3beGelL7loYtMPyWiq6/D1HoKEhg8zBrjdCDXzFU7KlSjTtMD32YsIC4ly3g E+aVKGkIEufTyNTKbGsjV71hJ5Md129f09doUbUo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727247AbgJEXhu (ORCPT ); Mon, 5 Oct 2020 19:37:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:38128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725973AbgJEXhs (ORCPT ); Mon, 5 Oct 2020 19:37:48 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 09E87207F7; Mon, 5 Oct 2020 23:37:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601941068; bh=alrgM9k5I/Vja+EvD0IFWV5aNvNpxkYLyuOosw+D8lY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N7LFgZOAJZXvemvuVWXt5lzsQGq0KkehpvyMyywyGdpacT3Qjwv07d5BZt6TrCWqb D0OixPmuBn2E3hBVOZNWpUjzBHuFt92DXJwV8/VZGtXiQv6Xkj/QHqxUC3g8XxGE13 unW0g97/L5j8V1JR6YVrV3P/M4s0+JijSbhIPjbk= From: Sasha Levin To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, wei.liu@kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, vkuznets@redhat.com, mikelley@microsoft.com, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH v2 2/2] x86/hyperv: add a bounds check to hv_cpu_number_to_vp_number() Date: Mon, 5 Oct 2020 19:37:39 -0400 Message-Id: <20201005233739.2560641-2-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201005233739.2560641-1-sashal@kernel.org> References: <20201005233739.2560641-1-sashal@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have code that calls into hv_cpu_number_to_vp_number() without checking that the cpu number is valid, which would cause hv_cpu_number_to_vp_number() to dereference invalid memory. Instead, have hv_cpu_number_to_vp_number() fail gracefully and add a warning to make sure we catch these issues quickly. Signed-off-by: Sasha Levin --- include/asm-generic/mshyperv.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h index c5edc5e08b94f..c7d22cb8340ff 100644 --- a/include/asm-generic/mshyperv.h +++ b/include/asm-generic/mshyperv.h @@ -125,6 +125,9 @@ extern u32 hv_max_vp_index; */ static inline int hv_cpu_number_to_vp_number(int cpu_number) { + if (WARN_ON_ONCE(cpu_number < 0 || cpu_number >= num_possible_cpus())) + return VP_INVAL; + return hv_vp_index[cpu_number]; } -- 2.25.1