mm: fix section name for .data..ro_after_init
A section name for .data..ro_after_init was added by both: commitd07a980c1b
("s390: add proper __ro_after_init support") and commitd7c19b066d
("mm: kmemleak: scan .data.ro_after_init") The latter adds incorrect wrapping around the existing s390 section, and came later. I'd prefer the s390 naming, so this moves the s390-specific name up to the asm-generic/sections.h and renames the section as used by kmemleak (and in the future, kernel/extable.c). Link: http://lkml.kernel.org/r/20170327192213.GA129375@beast Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> [s390 parts] Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com> Cc: Eddie Kovsky <ewk@edkovsky.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
c9d398fa23
Коммит
906f2a51c9
|
@ -4,6 +4,5 @@
|
|||
#include <asm-generic/sections.h>
|
||||
|
||||
extern char _eshared[], _ehead[];
|
||||
extern char __start_ro_after_init[], __end_ro_after_init[];
|
||||
|
||||
#endif
|
||||
|
|
|
@ -63,11 +63,9 @@ SECTIONS
|
|||
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
__start_ro_after_init = .;
|
||||
__start_data_ro_after_init = .;
|
||||
.data..ro_after_init : {
|
||||
*(.data..ro_after_init)
|
||||
}
|
||||
__end_data_ro_after_init = .;
|
||||
EXCEPTION_TABLE(16)
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
__end_ro_after_init = .;
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
* [_sdata, _edata]: contains .data.* sections, may also contain .rodata.*
|
||||
* and/or .init.* sections.
|
||||
* [__start_rodata, __end_rodata]: contains .rodata.* sections
|
||||
* [__start_data_ro_after_init, __end_data_ro_after_init]:
|
||||
* contains data.ro_after_init section
|
||||
* [__start_ro_after_init, __end_ro_after_init]:
|
||||
* contains .data..ro_after_init section
|
||||
* [__init_begin, __init_end]: contains .init.* sections, but .init.text.*
|
||||
* may be out of this range on some architectures.
|
||||
* [_sinittext, _einittext]: contains .init.text.* sections
|
||||
|
@ -33,7 +33,7 @@ extern char _data[], _sdata[], _edata[];
|
|||
extern char __bss_start[], __bss_stop[];
|
||||
extern char __init_begin[], __init_end[];
|
||||
extern char _sinittext[], _einittext[];
|
||||
extern char __start_data_ro_after_init[], __end_data_ro_after_init[];
|
||||
extern char __start_ro_after_init[], __end_ro_after_init[];
|
||||
extern char _end[];
|
||||
extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[];
|
||||
extern char __kprobes_text_start[], __kprobes_text_end[];
|
||||
|
|
|
@ -260,9 +260,9 @@
|
|||
*/
|
||||
#ifndef RO_AFTER_INIT_DATA
|
||||
#define RO_AFTER_INIT_DATA \
|
||||
__start_data_ro_after_init = .; \
|
||||
__start_ro_after_init = .; \
|
||||
*(.data..ro_after_init) \
|
||||
__end_data_ro_after_init = .;
|
||||
__end_ro_after_init = .;
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
@ -1416,7 +1416,7 @@ static void kmemleak_scan(void)
|
|||
/* data/bss scanning */
|
||||
scan_large_block(_sdata, _edata);
|
||||
scan_large_block(__bss_start, __bss_stop);
|
||||
scan_large_block(__start_data_ro_after_init, __end_data_ro_after_init);
|
||||
scan_large_block(__start_ro_after_init, __end_ro_after_init);
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
/* per-cpu sections scanning */
|
||||
|
|
Загрузка…
Ссылка в новой задаче