mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>,
	Michael Ellerman <mpe@ellerman.id.au>,
	Sasha Levin <sashal@kernel.org>,
	npiggin@gmail.com, farosas@linux.ibm.com, paulus@ozlabs.org,
	linuxppc-dev@lists.ozlabs.org
Subject: [PATCH AUTOSEL 5.10 13/34] KVM: PPC: Book3S: Suppress warnings when allocating too big memory slots
Date: Mon, 17 Jan 2022 12:03:03 -0500	[thread overview]
Message-ID: <20220117170326.1471712-13-sashal@kernel.org> (raw)
In-Reply-To: <20220117170326.1471712-1-sashal@kernel.org>

From: Alexey Kardashevskiy <aik@ozlabs.ru>

[ Upstream commit 511d25d6b789fffcb20a3eb71899cf974a31bd9d ]

The userspace can trigger "vmalloc size %lu allocation failure: exceeds
total pages" via the KVM_SET_USER_MEMORY_REGION ioctl.

This silences the warning by checking the limit before calling vzalloc()
and returns ENOMEM if failed.

This does not call underlying valloc helpers as __vmalloc_node() is only
exported when CONFIG_TEST_VMALLOC_MODULE and __vmalloc_node_range() is
not exported at all.

Spotted by syzkaller.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
[mpe: Use 'size' for the variable rather than 'cb']
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210901084512.1658628-1-aik@ozlabs.ru
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/powerpc/kvm/book3s_hv.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 175967a195c44..527c205d5a5f5 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -4557,8 +4557,12 @@ static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,
 	unsigned long npages = mem->memory_size >> PAGE_SHIFT;
 
 	if (change == KVM_MR_CREATE) {
-		slot->arch.rmap = vzalloc(array_size(npages,
-					  sizeof(*slot->arch.rmap)));
+		unsigned long size = array_size(npages, sizeof(*slot->arch.rmap));
+
+		if ((size >> PAGE_SHIFT) > totalram_pages())
+			return -ENOMEM;
+
+		slot->arch.rmap = vzalloc(size);
 		if (!slot->arch.rmap)
 			return -ENOMEM;
 	}
-- 
2.34.1


  parent reply	other threads:[~2022-01-17 17:08 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-17 17:02 [PATCH AUTOSEL 5.10 01/34] ALSA: usb-audio: Fix dB level of Bose Revolve+ SoundLink Sasha Levin
2022-01-17 17:02 ` [PATCH AUTOSEL 5.10 02/34] clk: imx: Use div64_ul instead of do_div Sasha Levin
2022-01-17 17:02 ` [PATCH AUTOSEL 5.10 03/34] powerpc/6xx: add missing of_node_put Sasha Levin
2022-01-17 17:02 ` [PATCH AUTOSEL 5.10 04/34] powerpc/powernv: " Sasha Levin
2022-01-17 17:02 ` [PATCH AUTOSEL 5.10 05/34] powerpc/cell: " Sasha Levin
2022-01-17 17:02 ` [PATCH AUTOSEL 5.10 06/34] powerpc/btext: " Sasha Levin
2022-01-17 17:02 ` [PATCH AUTOSEL 5.10 07/34] powerpc/watchdog: Fix missed watchdog reset due to memory ordering race Sasha Levin
2022-01-17 17:02 ` [PATCH AUTOSEL 5.10 08/34] i2c: i801: Don't silently correct invalid transfer size Sasha Levin
2022-01-17 17:02 ` [PATCH AUTOSEL 5.10 09/34] powerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILING Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 10/34] i2c: mpc: Correct I2C reset procedure Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 11/34] clk: meson: gxbb: Fix the SDM_EN bit for MPLL0 on GXBB Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 12/34] powerpc/powermac: Add missing lockdep_register_key() Sasha Levin
2022-01-17 17:03 ` Sasha Levin [this message]
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 14/34] KVM: PPC: Book3S: Suppress failed alloc warning in H_COPY_TOFROM_GUEST Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 15/34] w1: Misuse of get_user()/put_user() reported by sparse Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 16/34] nvmem: core: set size for sysfs bin file Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 17/34] dm: fix alloc_dax error handling in alloc_dev Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 18/34] scsi: lpfc: Trigger SLI4 firmware dump before doing driver cleanup Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 19/34] ALSA: seq: Set upper limit of processed events Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 20/34] MIPS: Loongson64: Use three arguments for slti Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 21/34] powerpc/40x: Map 32Mbytes of memory at startup Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 22/34] selftests/powerpc/spectre_v2: Return skip code when miss_percent is high Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 23/34] powerpc: handle kdump appropriately with crash_kexec_post_notifiers option Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 24/34] powerpc/fadump: Fix inaccurate CPU state info in vmcore generated with panic Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 25/34] udf: Fix error handling in udf_new_inode() Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 26/34] MIPS: OCTEON: add put_device() after of_find_device_by_node() Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 27/34] irqchip/gic-v4: Disable redistributors' view of the VPE table at boot time Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 28/34] i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 29/34] MIPS: Octeon: Fix build errors using clang Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 30/34] scsi: sr: Don't use GFP_DMA Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 31/34] ASoC: mediatek: mt8173: fix device_node leak Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 32/34] ASoC: mediatek: mt8183: " Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 33/34] phy: mediatek: Fix missing check in mtk_mipi_tx_probe Sasha Levin
2022-01-17 17:03 ` [PATCH AUTOSEL 5.10 34/34] leds: leds-fsg: Drop FSG3 LED driver Sasha Levin
2022-01-17 23:09   ` Pavel Machek
2022-01-22 18:45     ` Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220117170326.1471712-13-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=aik@ozlabs.ru \
    --cc=farosas@linux.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=npiggin@gmail.com \
    --cc=paulus@ozlabs.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome