All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Alexander Gordeev <agordeev@linux.ibm.com>,
	Vasily Gorbik <gor@linux.ibm.com>,
	Heiko Carstens <hca@linux.ibm.com>,
	Sasha Levin <sashal@kernel.org>,
	kasan-dev@googlegroups.com, linux-s390@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 29/30] s390/kasan: fix large PMD pages address alignment check
Date: Sun,  5 Sep 2021 21:22:42 -0400	[thread overview]
Message-ID: <20210906012244.930338-29-sashal@kernel.org> (raw)
In-Reply-To: <20210906012244.930338-1-sashal@kernel.org>

From: Alexander Gordeev <agordeev@linux.ibm.com>

[ Upstream commit ddd63c85ef67ea9ea7282ad35eafb6568047126e ]

It is currently possible to initialize a large PMD page when
the address is not aligned on page boundary.

Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/s390/mm/kasan_init.c | 41 +++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/arch/s390/mm/kasan_init.c b/arch/s390/mm/kasan_init.c
index 460f25572940..5182e0836ca7 100644
--- a/arch/s390/mm/kasan_init.c
+++ b/arch/s390/mm/kasan_init.c
@@ -101,6 +101,9 @@ static void __init kasan_early_vmemmap_populate(unsigned long address,
 	pgt_prot = pgprot_val(PAGE_KERNEL_EXEC);
 	sgt_prot = pgprot_val(SEGMENT_KERNEL_EXEC);
 
+	/*
+	 * The first 1MB of 1:1 mapping is mapped with 4KB pages
+	 */
 	while (address < end) {
 		pg_dir = pgd_offset_k(address);
 		if (pgd_none(*pg_dir)) {
@@ -146,30 +149,26 @@ static void __init kasan_early_vmemmap_populate(unsigned long address,
 
 		pm_dir = pmd_offset(pu_dir, address);
 		if (pmd_none(*pm_dir)) {
-			if (mode == POPULATE_ZERO_SHADOW &&
-			    IS_ALIGNED(address, PMD_SIZE) &&
+			if (IS_ALIGNED(address, PMD_SIZE) &&
 			    end - address >= PMD_SIZE) {
-				pmd_populate(&init_mm, pm_dir,
-						kasan_early_shadow_pte);
-				address = (address + PMD_SIZE) & PMD_MASK;
-				continue;
-			}
-			/* the first megabyte of 1:1 is mapped with 4k pages */
-			if (has_edat && address && end - address >= PMD_SIZE &&
-			    mode != POPULATE_ZERO_SHADOW) {
-				void *page;
-
-				if (mode == POPULATE_ONE2ONE) {
-					page = (void *)address;
-				} else {
-					page = kasan_early_alloc_segment();
-					memset(page, 0, _SEGMENT_SIZE);
+				if (mode == POPULATE_ZERO_SHADOW) {
+					pmd_populate(&init_mm, pm_dir, kasan_early_shadow_pte);
+					address = (address + PMD_SIZE) & PMD_MASK;
+					continue;
+				} else if (has_edat && address) {
+					void *page;
+
+					if (mode == POPULATE_ONE2ONE) {
+						page = (void *)address;
+					} else {
+						page = kasan_early_alloc_segment();
+						memset(page, 0, _SEGMENT_SIZE);
+					}
+					pmd_val(*pm_dir) = __pa(page) | sgt_prot;
+					address = (address + PMD_SIZE) & PMD_MASK;
+					continue;
 				}
-				pmd_val(*pm_dir) = __pa(page) | sgt_prot;
-				address = (address + PMD_SIZE) & PMD_MASK;
-				continue;
 			}
-
 			pt_dir = kasan_early_pte_alloc();
 			pmd_populate(&init_mm, pm_dir, pt_dir);
 		} else if (pmd_large(*pm_dir)) {
-- 
2.30.2


  parent reply	other threads:[~2021-09-06  1:32 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-06  1:22 [PATCH AUTOSEL 5.4 01/30] locking/mutex: Fix HANDOFF condition Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 02/30] regmap: fix the offset of register error log Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 03/30] crypto: mxs-dcp - Check for DMA mapping errors Sasha Levin
2021-09-06  1:22   ` Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 04/30] sched/deadline: Fix reset_on_fork reporting of DL tasks Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 05/30] power: supply: axp288_fuel_gauge: Report register-address on readb / writeb errors Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 06/30] crypto: omap-sham - clear dma flags only after omap_sham_update_dma_stop() Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 07/30] sched/deadline: Fix missing clock update in migrate_task_rq_dl() Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 08/30] rcu/tree: Handle VM stoppage in stall detection Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 09/30] posix-cpu-timers: Force next expiration recalc after itimer reset Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 10/30] hrtimer: Avoid double reprogramming in __hrtimer_start_range_ns() Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 11/30] hrtimer: Ensure timerfd notification for HIGHRES=n Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 12/30] udf: Check LVID earlier Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 13/30] udf: Fix iocharset=utf8 mount option Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 14/30] isofs: joliet: " Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 15/30] bcache: add proper error unwinding in bcache_device_init Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 16/30] nvme-tcp: don't update queue count when failing to set io queues Sasha Levin
2021-09-06  1:22   ` Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 17/30] nvme-rdma: " Sasha Levin
2021-09-06  1:22   ` Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 18/30] nvmet: pass back cntlid on successful completion Sasha Levin
2021-09-06  1:22   ` Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 19/30] power: supply: max17042_battery: fix typo in MAx17042_TOFF Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 20/30] s390/cio: add dev_busid sysfs entry for each subchannel Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 21/30] libata: fix ata_host_start() Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 22/30] crypto: qat - do not ignore errors from enable_vf2pf_comms() Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 23/30] crypto: qat - handle both source of interrupt in VF ISR Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 24/30] crypto: qat - fix reuse of completion variable Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 25/30] crypto: qat - fix naming for init/shutdown VF to PF notifications Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 26/30] crypto: qat - do not export adf_iov_putmsg() Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 27/30] fcntl: fix potential deadlock for &fasync_struct.fa_lock Sasha Levin
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 28/30] udf_get_extendedattr() had no boundary checks Sasha Levin
2021-09-06  1:22 ` Sasha Levin [this message]
2021-09-06  1:22 ` [PATCH AUTOSEL 5.4 30/30] s390/debug: fix debug area life cycle 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=20210906012244.930338-29-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=agordeev@linux.ibm.com \
    --cc=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=kasan-dev@googlegroups.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.