From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 840BD2253FF; Mon, 31 Mar 2025 14:36:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743431760; cv=none; b=s8mqttiytziWMF8HE+uLgtvOFUSlftWv6d7obGJXXOzyFlwfKtQgddKkLPtQ4CPmaKq/XekHCQlInMrhfEV/U8noylNN4LV7BBcf3RvNY2Es97cLyTmSsOZLbzkljRJ7e45jfHStBigpFCG7DeOzQJJS8jONCh4pvyFcgmn8t2s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743431760; c=relaxed/simple; bh=5DlYIc+Mxp6wP2XagxFIavXx5bYn9hjr7ENOqeYEYRg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OnoNKgHzGPUChc9lrzNWecq3zLam7ZYxzwIp5VXRs2Bjq4zkdAQNgi3OwetXrlj5uHSwy9ludRz6LiCEGuMpZT3+LktXkokROsqc5OdqcyzsSstDdVcQ7+w03KRzyWWQ0zu82x5uGvzrE5wXSCj+Bp8C1NKwfO2nHx3aQlIuRGg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tn7zQbUb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tn7zQbUb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C22D3C4CEE3; Mon, 31 Mar 2025 14:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743431760; bh=5DlYIc+Mxp6wP2XagxFIavXx5bYn9hjr7ENOqeYEYRg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tn7zQbUbINS1Nn8Gxx4Vmu8xlutCsFT1nlTN9JOI2oEzFbBCNLsqwbBFTGKxFKnov 02MAJokLCP8L/BRNehBLFLiz28hdkQV0zgE3mPxRnAeKMulRB8Evcrx4VMh172gOn2 GO9HnC1n3VtFjw8UdnuPh/eo1ikd4BM1ApWQz07wVQKJzbIRNC5hHJ1gxIqztOTHlk ATHMJjQFQ/8o6ceNlvJpL6Jcav9MjkXtUzFpJ3Tcw2Fhmep0RtzF6YRml1M5XkakzU 5FpzcL+enpvI1pT0w03ZdV6zkL8tCBdWsoKttEKt/Am126gJB1oHBqFeonAtSuRHgn Z0jws07UrAc9A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Kirill A. Shutemov" , Ingo Molnar , Kai Huang , Tom Lendacky , Andy Lutomirski , Linus Torvalds , Sasha Levin , dave.hansen@linux.intel.com, peterz@infradead.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org Subject: [PATCH AUTOSEL 6.12 12/13] x86/mm/ident_map: Fix theoretical virtual address overflow to zero Date: Mon, 31 Mar 2025 10:35:26 -0400 Message-Id: <20250331143528.1685794-12-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250331143528.1685794-1-sashal@kernel.org> References: <20250331143528.1685794-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.21 Content-Transfer-Encoding: 8bit From: "Kirill A. Shutemov" [ Upstream commit f666c92090a41ac5524dade63ff96b3adcf8c2ab ] The current calculation of the 'next' virtual address in the page table initialization functions in arch/x86/mm/ident_map.c doesn't protect against wrapping to zero. This is a theoretical issue that cannot happen currently, the problematic case is possible only if the user sets a high enough x86_mapping_info::offset value - which no current code in the upstream kernel does. ( The wrapping to zero only occurs if the top PGD entry is accessed. There are no such users upstream. Only hibernate_64.c uses x86_mapping_info::offset, and it operates on the direct mapping range, which is not the top PGD entry. ) Should such an overflow happen, it can result in page table corruption and a hang. To future-proof this code, replace the manual 'next' calculation with p?d_addr_end() which handles wrapping correctly. [ Backporter's note: there's no need to backport this patch. ] Signed-off-by: Kirill A. Shutemov Signed-off-by: Ingo Molnar Reviewed-by: Kai Huang Reviewed-by: Tom Lendacky Cc: Andy Lutomirski Cc: Linus Torvalds Link: https://lore.kernel.org/r/20241016111458.846228-2-kirill.shutemov@linux.intel.com Signed-off-by: Sasha Levin --- arch/x86/mm/ident_map.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c index 5ab7bd2f1983c..bd5d101c5c379 100644 --- a/arch/x86/mm/ident_map.c +++ b/arch/x86/mm/ident_map.c @@ -101,9 +101,7 @@ static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page, pmd_t *pmd; bool use_gbpage; - next = (addr & PUD_MASK) + PUD_SIZE; - if (next > end) - next = end; + next = pud_addr_end(addr, end); /* if this is already a gbpage, this portion is already mapped */ if (pud_leaf(*pud)) @@ -154,10 +152,7 @@ static int ident_p4d_init(struct x86_mapping_info *info, p4d_t *p4d_page, p4d_t *p4d = p4d_page + p4d_index(addr); pud_t *pud; - next = (addr & P4D_MASK) + P4D_SIZE; - if (next > end) - next = end; - + next = p4d_addr_end(addr, end); if (p4d_present(*p4d)) { pud = pud_offset(p4d, 0); result = ident_pud_init(info, pud, addr, next); @@ -199,10 +194,7 @@ int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page, pgd_t *pgd = pgd_page + pgd_index(addr); p4d_t *p4d; - next = (addr & PGDIR_MASK) + PGDIR_SIZE; - if (next > end) - next = end; - + next = pgd_addr_end(addr, end); if (pgd_present(*pgd)) { p4d = p4d_offset(pgd, 0); result = ident_p4d_init(info, p4d, addr, next); -- 2.39.5