Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm: move randomize_va_space into memory.c 

Move the randomize_va_space variable together with all its sysctl table
elements into memory.c. Register it to the "kernel" directory by
adding it to the subsys initialization calls

This is part of a greater effort to move ctl tables into their
respective subsystems which will reduce the merge conflicts in
kernel/sysctl.c.

Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Kees Cook <kees@kernel.org>
Signed-off-by: Joel Granados <joel.granados@kernel.org>
This commit is contained in:
Joel Granados 2025-04-30 14:42:13 +02:00
parent fff6703fc8
commit 851911aa72
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/sysctl.c
View File

@ -1688,15 +1688,6 @@ static const struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
#if defined(CONFIG_MMU)
{
.procname = "randomize_va_space",
.data = &randomize_va_space,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
#endif
#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
{ {
.procname = "ignore-unaligned-usertrap", .procname = "ignore-unaligned-usertrap",

18
mm/memory.c
View File

@ -125,6 +125,24 @@ int randomize_va_space __read_mostly =
2; 2;
#endif #endif
static const struct ctl_table mmu_sysctl_table[] = {
{
.procname = "randomize_va_space",
.data = &randomize_va_space,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
};
static int __init init_mm_sysctl(void)
{
register_sysctl_init("kernel", mmu_sysctl_table);
return 0;
}
subsys_initcall(init_mm_sysctl);
#ifndef arch_wants_old_prefaulted_pte #ifndef arch_wants_old_prefaulted_pte
static inline bool arch_wants_old_prefaulted_pte(void) static inline bool arch_wants_old_prefaulted_pte(void)
{ {