Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795053949; b=ZvIm2pwDUk9Yu3l43WpsbYrthzB3KgnN4UQ0d3xNhHaJNckHXeLwS3AUFgSs/NThRwgF DEqPHcXrbTWyZDBepXJ/8w+VdvFOy21Jka3cn4zhuS/jDTyPT+7fXc+s3aAyBitG3oH7A gPtAjYKv08khCDb4fDEUeHYXHsiLfZhmPcIbcj1WddOmk7+rUBsd6gtixwlWUvsQQA+ca eZW7E7grGvjSZKxWToE4WUea76R24KVedBCyBWalGpM9KupP2B5B0g0ncBIe5AzdLFcpj NHhoZIOJDUjCYxGlvTK/DruyEmm9ysqOEKQE06LKu9g88GedqpkZ94WxQQ6JhNDalrA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053949; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=tdLPWe+57kt5tMUrvsidLgVeb/WTjylvdoi58GvNByc=; b=zcDzU/BXFd4FhNh65R2KkcvZRzcWzTiXXsoxLrVQkpAYB0bnz7gUerHmXai4wADvHzSb 9qHAZFXyb/jsx1Y273HehpSuAJUkQLJCbAFJ0Hdbc9k3hYcrliNbdMyp2jcusM0LQd1Ge Vu8nknC+BSyXNK5Hkrxx6amRJNXvVnnue5B1dyQgJFY74BfZYwvRVKf169FMAbSuPVfF2 oTsRi+paCNGcYj5HMSZVfC8/JI4S7lH00y4dtbc6ma8YKhMcGah9uIsvadMBXAEj9d4Mu 6foMTqhOQiOjpEsCICIuEzrmd6h5qFuTYyAdm+6u2jTXG9kTrYyqD1xhiKjJbwXwNIw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=N20Z+mBj; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5EDFF606A32A; Thu, 19 Nov 2026 02:05:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=N20Z+mBj Received: by smtp.kernel.org (Postfix) with ESMTPSA id B61081F000C4; Thu, 19 Nov 2026 02:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053949; bh=tdLPWe+57kt5tMUrvsidLgVeb/WTjylvdoi58GvNByc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N20Z+mBjxa4riCXjcx+4i4XTE5cjKHojfTZK8YF2mj+pyd5+8zQHHH1n1aUdABlzO AuxIGVhJYckGGH0mC3AoFosVU0VjyJyMyCsEntNG9QCG/LkClghI5WpG2oo7bQXRBz NBdaSK1oiWsZgOTrPoUZQMZ4nTQxWl5tVqWT9OYA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nickolai Zeldovich , Andrew Morton , Pedro Falcato , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , Sasha Levin Subject: [PATCH 5.15 1100/2214] mm/mlock: use a long for the page count in mlock_fixup() Date: Wed, 18 Nov 2026 15:46:16 +0100 Message-ID: <20261118150056.195406424@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nickolai Zeldovich [ Upstream commit 3ae91e3079b1504ef162b2884454d5f1421f4eb9 ] mlock_fixup() adjusts mm->locked_vm, an unsigned long, by the number of pages whose VM_LOCKED state it changes, but computes that number in an int: int nr_pages; ... nr_pages = (end - start) >> PAGE_SHIFT; ... mm->locked_vm += nr_pages; When a single VMA range of 2^31 pages (8 TiB with 4 KiB pages) or more is locked or unlocked, the count is truncated to 32 bits and then sign-extended, so locked_vm is changed by the wrong amount, while munmap(), mremap() and the other paths that maintain locked_vm use the full unsigned long page count. Such a range is reachable on 64-bit architectures with a 47-bit or larger user address space (x86_64, arm64 with 48-bit VA, riscv64 Sv48) by a task with CAP_IPC_LOCK or a raised RLIMIT_MEMLOCK, which do_mlock() checks against the full untruncated length. It costs nothing with MAP_NORESERVE and MLOCK_ONFAULT/MCL_ONFAULT, since then no page is populated. On x86_64, after p = mmap(NULL, 8UL << 40, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); mlock2(p, 8UL << 40, MLOCK_ONFAULT); VmLck in /proc/self/status reads 18446744065119617024 kB instead of 8589934592 kB; munmap() of the region then subtracts the true size and leaves VmLck at 18446744056529682432 kB instead of 0. With 16 TiB, locked_vm is not changed at all, VmLck stays 0 kB, and after the task drops CAP_IPC_LOCK or lowers RLIMIT_MEMLOCK, mlock(), mmap(MAP_LOCKED) and the other mlock_future_ok() and account_locked_vm() users enforce RLIMIT_MEMLOCK against that count, so they let the task lock memory beyond its limit (or, in the 8 TiB case, refuse every further lock). The error persists for the life of the mm; unlocking the range in pieces skews it further. The wrong count is per-mm accounting only: it does not change which pages are locked. The int has been there since before git history (the variable was named "pages" until it was renamed in 2.6.28); every other updater of locked_vm uses an unsigned long or long count. Make nr_pages a long, which holds the page count of any user range and its negation, so the existing sign handling is unchanged. Found by formal verification of mm/mlock.c against the kernel binary. Link: https://lore.kernel.org/20261014131358.780240-1-nickolai@csail.mit.edu Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Nickolai Zeldovich Signed-off-by: Andrew Morton Reviewed-by: Pedro Falcato Assisted-by: LLM Cc: Liam R. Howlett Cc: Lorenzo Stoakes Cc: Vlastimil Babka Cc: Jann Horn Cc: [ sashal: adjusted context for the older mlock_fixup() signature and local variable declarations ] Signed-off-by: Sasha Levin --- mm/mlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mlock.c b/mm/mlock.c index 0cee3f97d3df7..0b9b3ce7a5e4b 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -497,7 +497,7 @@ static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev, { struct mm_struct *mm = vma->vm_mm; pgoff_t pgoff; - int nr_pages; + long nr_pages; int ret = 0; int lock = !!(newflags & VM_LOCKED); vm_flags_t old_flags = vma->vm_flags; -- 2.53.0