From c7a5157d4de03982fcd2e3cd1f035858153ab349 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 17 Mar 2021 12:44:57 -0500 Subject: kernel-5.11.7-9 * Wed Mar 17 2021 Justin M. Forbes [5.11.7-9] - Disable weak-modules again rhbz 1828455 (Justin M. Forbes) - More config updates for gcc-plugin turn off (Justin M. Forbes) - fedora: the PCH_CAN driver is x86-32 only (Peter Robinson) - common: disable legacy CAN device support (Peter Robinson) - common: Enable Microchip MCP251x/MCP251xFD CAN controllers (Peter Robinson) - common: Bosch MCAN support for Intel Elkhart Lake (Peter Robinson) - common: enable CAN_PEAK_PCIEFD PCI-E driver (Peter Robinson) - common: disable CAN_PEAK_PCIEC PCAN-ExpressCard (Peter Robinson) - common: enable common CAN layer 2 protocols (Peter Robinson) - ark: disable CAN_LEDS option (Peter Robinson) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- ...emleak-skip-late_init-if-not-skip-disable.patch | 71 ---------------------- 1 file changed, 71 deletions(-) delete mode 100644 0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch (limited to '0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch') diff --git a/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch b/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch deleted file mode 100644 index a8bf98d50..000000000 --- a/0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Murphy Zhou -Date: Sun, 29 Sep 2019 17:56:59 +0800 -Subject: [PATCH] mm/kmemleak: skip late_init if not skip disable - -Now if DEFAULT_OFF set to y, kmemleak_init will start the cleanup_work -workqueue. Then late_init call will set kmemleak_initialized to 1, the -cleaup workqueue will try to do cleanup, triggering: - -[24.738773] ================================================================== -[24.742784] BUG: KASAN: global-out-of-bounds in __kmemleak_do_cleanup+0x166/0x180 -[24.744144] Key type ._fscrypt registered -[24.745680] Read of size 8 at addr ffffffff88746c90 by task kworker/3:1/171 -[24.745687] -[24.745697] CPU: 3 PID: 171 Comm: kworker/3:1 Not tainted 5.3.0-v5.3-12475-gcbafe18 #1 -[24.745701] Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 -[24.745710] Workqueue: events kmemleak_do_cleanup -[24.745717] Call Trace: -[24.745736] dump_stack+0x7c/0xc0 -[24.745755] print_address_description.constprop.4+0x1f/0x300 -[24.751562] Key type .fscrypt registered -[24.754370] __kasan_report.cold.8+0x76/0xb2 -[24.754388] ? __kmemleak_do_cleanup+0x166/0x180 -[24.754407] kasan_report+0xe/0x20 -[24.778543] __kmemleak_do_cleanup+0x166/0x180 -[24.780795] process_one_work+0x919/0x17d0 -[24.782929] ? pwq_dec_nr_in_flight+0x320/0x320 -[24.785092] worker_thread+0x87/0xb40 -[24.786948] ? __kthread_parkme+0xc3/0x190 -[24.789217] ? process_one_work+0x17d0/0x17d0 -[24.791414] kthread+0x333/0x3f0 -[24.793031] ? kthread_create_worker_on_cpu+0xc0/0xc0 -[24.795473] ret_from_fork+0x3a/0x50 -[24.797303] -[24.798091] The buggy address belongs to the variable: -[24.800634] mem_pool_free_count+0x10/0x40 -[24.802656] -[24.803434] Memory state around the buggy address: -[24.805793] ffffffff88746b80: 04 fa fa fa fa fa fa fa 00 00 00 00 00 00 00 00 -[24.809177] ffffffff88746c00: 00 fa fa fa fa fa fa fa 00 00 fa fa fa fa fa fa -[24.812407] >ffffffff88746c80: 04 fa fa fa fa fa fa fa 00 00 fa fa fa fa fa fa -[24.815638] ^ -[24.817372] ffffffff88746d00: 00 00 fa fa fa fa fa fa 00 00 00 00 00 00 00 00 -[24.820740] ffffffff88746d80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -[24.824021] ================================================================== - -Fixes: c5665868183f ("mm: kmemleak: use the memory pool for early allocations") -Signed-off-by: Murphy Zhou ---- - mm/kmemleak.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/mm/kmemleak.c b/mm/kmemleak.c -index e362dc3d2028..0c3dfb8eef67 100644 ---- a/mm/kmemleak.c -+++ b/mm/kmemleak.c -@@ -1958,6 +1958,11 @@ void __init kmemleak_init(void) - */ - static int __init kmemleak_late_init(void) - { -+ if (!kmemleak_skip_disable) { -+ kmemleak_disable(); -+ return 0; -+ } -+ - kmemleak_initialized = 1; - - debugfs_create_file("kmemleak", 0644, NULL, NULL, &kmemleak_fops); --- -2.28.0 - -- cgit