Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A2A5C0032E for ; Wed, 25 Oct 2023 23:48:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230117AbjJYXsu (ORCPT ); Wed, 25 Oct 2023 19:48:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232813AbjJYXsV (ORCPT ); Wed, 25 Oct 2023 19:48:21 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D879C1AC for ; Wed, 25 Oct 2023 16:48:13 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78BF4C433C7; Wed, 25 Oct 2023 23:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1698277693; bh=OBFInzKBwtqDB10VlEQHAIbj5ZeoqJX/SJUvMdHNZYg=; h=Date:To:From:Subject:From; b=Z3eLWmxglPZ12ff6zbQT+nB3W5BxKcWmC9+TyGyLsgJFDV1c+O+pDPR2yw2zrdpxL Qzi19jP5w39EPTCNCDCEDjjnxlQBtJ2dDe3MUBod2/pyMToms9QmaUAtp7oRaCmO+x NkQoszs1mAdfSjdnNSbUJCoZOASht4F4cW9RmvQg= Date: Wed, 25 Oct 2023 16:48:12 -0700 To: mm-commits@vger.kernel.org, glider@google.com, elver@google.com, dvyukov@google.com, pedro.falcato@gmail.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-kmsan-panic-on-failure-to-allocate-early-boot-metadata.patch removed from -mm tree Message-Id: <20231025234813.78BF4C433C7@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm: kmsan: panic on failure to allocate early boot metadata has been removed from the -mm tree. Its filename was mm-kmsan-panic-on-failure-to-allocate-early-boot-metadata.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Pedro Falcato Subject: mm: kmsan: panic on failure to allocate early boot metadata Date: Mon, 16 Oct 2023 16:34:46 +0100 Given large enough allocations and a machine with low enough memory (i.e a default QEMU VM), it's entirely possible that kmsan_init_alloc_meta_for_range's shadow+origin allocation fails. Instead of eating a NULL deref kernel oops, check explicitly for memblock_alloc() failure and panic with a nice error message. Alexander Potapenko said: For posterity, it is generally quite important for the allocated shadow and origin to be contiguous, otherwise an unaligned memory write may result in memory corruption (the corresponding unaligned shadow write will be assuming that shadow pages are adjacent). So instead of panicking we could have split the range into smaller ones until the allocation succeeds, but that would've led to hard-to-debug problems in the future. Link: https://lkml.kernel.org/r/20231016153446.132763-1-pedro.falcato@gmail.com Signed-off-by: Pedro Falcato Reviewed-by: Alexander Potapenko Cc: Dmitry Vyukov Cc: Marco Elver Signed-off-by: Andrew Morton --- mm/kmsan/shadow.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/mm/kmsan/shadow.c~mm-kmsan-panic-on-failure-to-allocate-early-boot-metadata +++ a/mm/kmsan/shadow.c @@ -285,12 +285,17 @@ void __init kmsan_init_alloc_meta_for_ra size = PAGE_ALIGN((u64)end - (u64)start); shadow = memblock_alloc(size, PAGE_SIZE); origin = memblock_alloc(size, PAGE_SIZE); + + if (!shadow || !origin) + panic("%s: Failed to allocate metadata memory for early boot range of size %llu", + __func__, size); + for (u64 addr = 0; addr < size; addr += PAGE_SIZE) { page = virt_to_page_or_null((char *)start + addr); - shadow_p = virt_to_page_or_null((char *)shadow + addr); + shadow_p = virt_to_page((char *)shadow + addr); set_no_shadow_origin_page(shadow_p); shadow_page_for(page) = shadow_p; - origin_p = virt_to_page_or_null((char *)origin + addr); + origin_p = virt_to_page((char *)origin + addr); set_no_shadow_origin_page(origin_p); origin_page_for(page) = origin_p; } _ Patches currently in -mm which might be from pedro.falcato@gmail.com are