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 C921822E407; Mon, 10 Mar 2025 17:33:36 +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=1741628016; cv=none; b=GhMs+fqzT3AwXbp6xCABIiaGyB8GZPyIOSW1h3lyfHKgEu7ro/j6svqwo7cfEOIvn5zKXxG0rzZa23GzGzJhHqJlArGQYqyMxUgulCkvQwAnHIUz1whtKV+kUYOXjyi4vOOQH0Wytb3PfjUX8Jq7Sd8zlwDZ+2i6Z71Rs9x+SJc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628016; c=relaxed/simple; bh=oC79xdEh/EHrBoJeUy2kMAsOrWg5HPuYp80+xNfdBxI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CPxbHowQWJ1fxrBKUqZ+SrPPMYO3ziqzHq+M7iQzMiOx6OyjEsZcArl2QqOQ9FAo5JwQkAtj7F3CReEkwfn0sl5xtgcGBdo7GwOFcn2c7o1b6rjbXqSyVXKbOG15AUTAhYupSsUmq9YJDPQ/9PW9rEKE023DemT7vguSmX6Zo1Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fTP3Mh8E; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fTP3Mh8E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0FA5C4CEE5; Mon, 10 Mar 2025 17:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741628016; bh=oC79xdEh/EHrBoJeUy2kMAsOrWg5HPuYp80+xNfdBxI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fTP3Mh8EBu9kd3pKLcNVAD1nucbmlzwJ7dx4qjexSSV8dGFOq3XiEB5AP3mu19lI7 tQQhjDN5ihVvHrHo/T7B4fG8EQlFVF7ZL/w7p2eDVovPJxXNw/E2k43piIUEvD5D60 S42zSjwW2mRbreu66+UQJ/yvyYpX/Ji8sZnSYKRM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ryan Roberts , Anshuman Khandual , Catalin Marinas , Christop Hellwig , "Uladzislau Rezki (Sony)" , Andrew Morton Subject: [PATCH 6.6 058/145] mm: dont skip arch_sync_kernel_mappings() in error paths Date: Mon, 10 Mar 2025 18:05:52 +0100 Message-ID: <20250310170437.088124502@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170434.733307314@linuxfoundation.org> References: <20250310170434.733307314@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ryan Roberts commit 3685024edd270f7c791f993157d65d3c928f3d6e upstream. Fix callers that previously skipped calling arch_sync_kernel_mappings() if an error occurred during a pgtable update. The call is still required to sync any pgtable updates that may have occurred prior to hitting the error condition. These are theoretical bugs discovered during code review. Link: https://lkml.kernel.org/r/20250226121610.2401743-1-ryan.roberts@arm.com Fixes: 2ba3e6947aed ("mm/vmalloc: track which page-table levels were modified") Fixes: 0c95cba49255 ("mm: apply_to_pte_range warn and fail if a large pte is encountered") Signed-off-by: Ryan Roberts Reviewed-by: Anshuman Khandual Reviewed-by: Catalin Marinas Cc: Christop Hellwig Cc: "Uladzislau Rezki (Sony)" Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/memory.c | 6 ++++-- mm/vmalloc.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) --- a/mm/memory.c +++ b/mm/memory.c @@ -2746,8 +2746,10 @@ static int __apply_to_page_range(struct next = pgd_addr_end(addr, end); if (pgd_none(*pgd) && !create) continue; - if (WARN_ON_ONCE(pgd_leaf(*pgd))) - return -EINVAL; + if (WARN_ON_ONCE(pgd_leaf(*pgd))) { + err = -EINVAL; + break; + } if (!pgd_none(*pgd) && WARN_ON_ONCE(pgd_bad(*pgd))) { if (!create) continue; --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -558,13 +558,13 @@ static int vmap_small_pages_range_noflus mask |= PGTBL_PGD_MODIFIED; err = vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr, &mask); if (err) - return err; + break; } while (pgd++, addr = next, addr != end); if (mask & ARCH_PAGE_TABLE_SYNC_MASK) arch_sync_kernel_mappings(start, end); - return 0; + return err; } /*