qiurui/Centos-kernel-stream-10
1
0
Fork 0
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git synced 2026-09-09 00:07:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

security: min_addr: move sysctl to security/min_addr.c

Browse Source 
JIRA: https://redhat.atlassian.net/browse/RHEL-145694

commit b121dd4d557212067275e988137f2e2c5b2c0077
Author: Kaixiong Yu <yukaixiong@huawei.com>
Date:   Sat Jan 11 15:07:42 2025 +0800

    security: min_addr: move sysctl to security/min_addr.c

    The dac_mmap_min_addr belongs to min_addr.c, move it to
    min_addr.c from /kernel/sysctl.c. In the previous Linux kernel
    boot process, sysctl_init_bases needs to be executed before
    init_mmap_min_addr, So, register_sysctl_init should be executed
    before update_mmap_min_addr in init_mmap_min_addr. And according
    to the compilation condition in security/Makefile:

          obj-$(CONFIG_MMU)            += min_addr.o

    if CONFIG_MMU is not defined, min_addr.c would not be included in the
    compilation process. So, drop the CONFIG_MMU check.

    Signed-off-by: Kaixiong Yu <yukaixiong@huawei.com>
    Reviewed-by: Kees Cook <kees@kernel.org>
    Acked-by: Paul Moore <paul@paul-moore.com>
    Reviewed-by: Jeff Layton <jlayton@kernel.org>
    Signed-off-by: Joel Granados <joel.granados@kernel.org>

Signed-off-by: Rafael Aquini <raquini@redhat.com>
This commit is contained in:
Rafael Aquini
2026-07-01 16:15:57 -04:00
parent f103651237
commit 668e3734e8
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/sysctl.c
-9
View File
@@ -1829,15 +1829,6 @@ static const struct ctl_table vm_table[] = {
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ZERO,
},
#ifdef CONFIG_MMU
{
.procname = "mmap_min_addr",
.data = &dac_mmap_min_addr,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = mmap_min_addr_handler,
},
#endif
#if (defined(CONFIG_X86_32) && !defined(CONFIG_UML))|| \
(defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL))
{
security/min_addr.c
+11
View File
@@ -44,8 +44,19 @@ int mmap_min_addr_handler(const struct ctl_table *table, int write,
return ret;
}
static const struct ctl_table min_addr_sysctl_table[] = {
{
.procname = "mmap_min_addr",
.data = &dac_mmap_min_addr,
.maxlen = sizeof(unsigned long),
.mode = 0644,
.proc_handler = mmap_min_addr_handler,
},
};
static int __init init_mmap_min_addr(void)
{
register_sysctl_init("vm", min_addr_sysctl_table);
update_mmap_min_addr();
return 0;