From patchwork Mon Dec 13 13:47:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 12695904 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5D512C433EF for ; Mon, 13 Dec 2021 13:49:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=I0SuUPsOoTJVNqz0gVz6Z8X976VENFbX/y5BjGNHGUU=; b=0PCTPLkRyWXjib H7j9Q/blWepBL7kUHonjIoIl3BSswyjGjv+YqB3OYUVnRLlAa4PyYDM2svYWZnKuGoJTMp9huNcjU szb7HscVCkZWTsnTKAfYeWSHlr7SxzGVOvpjM+q/aOJwa/Sc2XFoIUnpiP5aHw4jMCM6EUXuTXR2U 8cCVjm/yLmuhnnIyIRo+RGMJYshx5EwRiCZ1Uv+1tR+Zl9UxQSIRqymEOqaKL3sHDkFbkVSIYTOdo ybzyYnOaWZGNpOT8sKg1xnCMWd8VxtNjBzmemJZtWyUGPqfidWN24dHImrB1XhCjOib3drJRr1DQR FqS/CUB5P6vwBYR8QQhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwlgm-009msc-3U; Mon, 13 Dec 2021 13:48:24 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwlgi-009mrH-IU for linux-arm-kernel@lists.infradead.org; Mon, 13 Dec 2021 13:48:22 +0000 Received: by mail-pj1-x102e.google.com with SMTP id f18-20020a17090aa79200b001ad9cb23022so13360085pjq.4 for ; Mon, 13 Dec 2021 05:48:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=89/haf77oWmfeSzgOBk+jk3fdztVk1x2oKfpAU1ji0Y=; b=MiEP/X0l1/rAqHUpTZDatWhJ9Ju7kHpU58JmIXfNEv7ICJwdxMOKrPouknqqVRzoZO KwBF8/3wHqtDf7i3P1MkyjCKGHXho++mkaE1CxxieuUjVeurEaAJHe8lIxiVdx8GOg9p mUcpOde6A9IPyiBAjPlT1n+n/5hnEGDkdSItCzNrKRMvSkAWkGW0cAWABbPJEB2y/obV rbbYtRgc3xgcEJxeNTZWuuZ7Yg+2fjQwPwlhgAovnI8EwGc/Nls0TVtlZdLWqgIZOA2G 69b/d1J3J0kKz6OOl+gVkptjSbZkP210D9MB1Nn1i+a9R43dk2q4JeKze82wiBVmH0Hx fR0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=89/haf77oWmfeSzgOBk+jk3fdztVk1x2oKfpAU1ji0Y=; b=i1ZuEQq0o4xlK8FR3tENNtip7LjsoHd/z2MkW7O5mLnFTvNBs7Ke+SoSrU25aNUg0S NcueYnl8KA2XPXwG1xa4h/s0v3PgRH3EOUscRPSJgJ5EW7/pvcvOARIMoAQvnWgBQDcY JUhJdih+zZ9XvybFOY0gtsUF8+HCjOZo5wGOGFF/zscNEf6/GsM8uJdt5jlp+pEHRBDN 9qYLStvSzJBS5alqBcorioTMhQ3N2ShD8ZLHS0gFiN7IFPIUtMwJJWS9rV0+Voufi67M eyIQ0tVcyqnxDV5zpfXymS33w4PL0+ibL4fqEGS+aVseZ+wYhxnZbCxpN8auMaZ/wLbx ZAcw== X-Gm-Message-State: AOAM532hDxgUjH+X14RVoLNQyqapMXQDlADFThikxyChEwReBEy+1uvu pJ7F3jgEOZC8JKQY2KCwCo/0YgzGvg== X-Google-Smtp-Source: ABdhPJyUu6e7TINZAOu1axCkMeUbSQ2vdIxfwGbs9KAYj5SLMkAwiWjoywNkKnrhuJRQgwSBuXy9zg== X-Received: by 2002:a17:90b:1812:: with SMTP id lw18mr43721934pjb.96.1639403298541; Mon, 13 Dec 2021 05:48:18 -0800 (PST) Received: from piliu.users.ipa.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id n16sm7336859pja.46.2021.12.13.05.48.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 05:48:18 -0800 (PST) From: Pingfan Liu To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Cc: Pingfan Liu , Catalin Marinas , Will Deacon , Andrew Morton , Mike Rapoport , Geert Uytterhoeven , Rob Herring , Frank Rowand , Nick Terrell Subject: [PATCH] arm64: fdt: fix membock add/cap ordering Date: Mon, 13 Dec 2021 21:47:45 +0800 Message-Id: <20211213134745.43505-1-kernelfans@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211213_054820_638649_4BF3BFB8 X-CRM114-Status: GOOD ( 15.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org During kdump kernel saves vmcore, it runs into the following bug: ... [ 15.148919] usercopy: Kernel memory exposure attempt detected from SLUB object 'kmem_cache_node' (offset 0, size 4096)! [ 15.159707] ------------[ cut here ]------------ [ 15.164311] kernel BUG at mm/usercopy.c:99! [ 15.168482] Internal error: Oops - BUG: 0 [#1] SMP [ 15.173261] Modules linked in: xfs libcrc32c crct10dif_ce ghash_ce sha2_ce sha256_arm64 sha1_ce sbsa_gwdt ast i2c_algo_bit drm_vram_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops cec drm_ttm_helper ttm drm nvme nvme_core xgene_hwmon i2c_designware_platform i2c_designware_core dm_mirror dm_region_hash dm_log dm_mod overlay squashfs zstd_decompress loop [ 15.206186] CPU: 0 PID: 542 Comm: cp Not tainted 5.16.0-rc4 #1 [ 15.212006] Hardware name: GIGABYTE R272-P30-JG/MP32-AR0-JG, BIOS F12 (SCP: 1.5.20210426) 05/13/2021 [ 15.221125] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 15.228073] pc : usercopy_abort+0x9c/0xa0 [ 15.232074] lr : usercopy_abort+0x9c/0xa0 [ 15.236070] sp : ffff8000121abba0 [ 15.239371] x29: ffff8000121abbb0 x28: 0000000000003000 x27: 0000000000000000 [ 15.246494] x26: 0000000080000400 x25: 0000ffff885c7000 x24: 0000000000000000 [ 15.253617] x23: 000007ff80400000 x22: ffff07ff80401000 x21: 0000000000000001 [ 15.260739] x20: 0000000000001000 x19: ffff07ff80400000 x18: ffffffffffffffff [ 15.267861] x17: 656a626f2042554c x16: 53206d6f72662064 x15: 6574636574656420 [ 15.274983] x14: 74706d6574746120 x13: 2129363930342065 x12: 7a6973202c302074 [ 15.282105] x11: ffffc8b041d1b148 x10: 00000000ffff8000 x9 : ffffc8b04012812c [ 15.289228] x8 : 00000000ffff7fff x7 : ffffc8b041d1b148 x6 : 0000000000000000 [ 15.296349] x5 : 0000000000000000 x4 : 0000000000007fff x3 : 0000000000000000 [ 15.303471] x2 : 0000000000000000 x1 : ffff07ff8c064800 x0 : 000000000000006b [ 15.310593] Call trace: [ 15.313027] usercopy_abort+0x9c/0xa0 [ 15.316677] __check_heap_object+0xd4/0xf0 [ 15.320762] __check_object_size.part.0+0x160/0x1e0 [ 15.325628] __check_object_size+0x2c/0x40 [ 15.329711] copy_oldmem_page+0x7c/0x140 [ 15.333623] read_from_oldmem.part.0+0xfc/0x1c0 [ 15.338142] __read_vmcore.constprop.0+0x23c/0x350 [ 15.342920] read_vmcore+0x28/0x34 [ 15.346309] proc_reg_read+0xb4/0xf0 [ 15.349871] vfs_read+0xb8/0x1f0 [ 15.353088] ksys_read+0x74/0x100 [ 15.356390] __arm64_sys_read+0x28/0x34 ... This bug introduced by commit b261dba2fdb2 ("arm64: kdump: Remove custom linux,usable-memory-range handling"), which moves memblock_cap_memory_range() to fdt, but it breaches the rules that memblock_cap_memory_range() should come after memblock_add() etc as said in commit e888fa7bb882 ("memblock: Check memory add/cap ordering"). As a consequence, the virtual address set up by copy_oldmem_page() does not bail out from the test of virt_addr_valid() in check_heap_object(), and finally hits the BUG_ON(). Since memblock allocator has no idea about the time point of the full memblock's population, resolving this issue at arch level code by calling a new interface early_init_dt_cap_memory_range() exposed by fdt. Fixes: b261dba2fdb2 ("arm64: kdump: Remove custom linux,usable-memory-range handling") Signed-off-by: Pingfan Liu Cc: Catalin Marinas Cc: Will Deacon Cc: Andrew Morton Cc: Mike Rapoport Cc: Geert Uytterhoeven Cc: Rob Herring Cc: Frank Rowand Cc: Nick Terrell To: linux-arm-kernel@lists.infradead.org To: devicetree@vger.kernel.org --- arch/arm64/kernel/setup.c | 1 + drivers/of/fdt.c | 5 +++++ include/linux/of_fdt.h | 1 + 3 files changed, 7 insertions(+) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index be5f85b0a24d..353e5171a66c 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -331,6 +331,7 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) xen_early_init(); efi_init(); + early_init_dt_cap_memory_range(); if (!efi_enabled(EFI_BOOT) && ((u64)_text % MIN_KIMG_ALIGN) != 0) pr_warn(FW_BUG "Kernel image misaligned at boot, please fix your bootloader!"); diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index bdca35284ceb..bb7e8fc3a334 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1278,6 +1278,11 @@ void __init early_init_dt_scan_nodes(void) memblock_cap_memory_range(cap_mem_addr, cap_mem_size); } +void __init early_init_dt_cap_memory_range(void) +{ + memblock_cap_memory_range(cap_mem_addr, cap_mem_size); +} + bool __init early_init_dt_scan(void *params) { bool status; diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index cf48983d3c86..3c8a01627c02 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -75,6 +75,7 @@ extern int early_init_dt_scan_root(unsigned long node, const char *uname, extern bool early_init_dt_scan(void *params); extern bool early_init_dt_verify(void *params); extern void early_init_dt_scan_nodes(void); +extern void early_init_dt_cap_memory_range(void); extern const char *of_flat_dt_get_machine_name(void); extern const void *of_flat_dt_match_machine(const void *default_match,