Commit dee65f79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'lsm-pr-20260202' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm 

Pull lsm fix from Paul Moore:
 "A small patch to address a regression found in the v6.19-rcX releases
  where the /proc/sys/vm/mmap_min_addr tunable disappeared when
  CONFIG_SECURITY was not selected.

  Long term we plan to work with the MM folks to get the core parts of
  this moved over to the MM subsystem, but in the meantime we need to
  fix this regression prior to the v6.19 release"

* tag 'lsm-pr-20260202' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
  lsm: preserve /proc/sys/vm/mmap_min_addr when !CONFIG_SECURITY
parents 18f7fcd5 bdde21d3

security/lsm.h

+0 −9
Original line number Diff line number Diff line
@@ -37,15 +37,6 @@ int lsm_task_alloc(struct task_struct *task); 


/* LSM framework initializers */



#ifdef CONFIG_MMU

int min_addr_init(void);

#else

static inline int min_addr_init(void)

{

	return 0;

}

#endif /* CONFIG_MMU */



#ifdef CONFIG_SECURITYFS

int securityfs_init(void);

#else

security/lsm_init.c

+1 −6
Original line number Diff line number Diff line
@@ -489,12 +489,7 @@ int __init security_init(void) 
 */

static int __init security_initcall_pure(void)

{

	int rc_adr, rc_lsm;



	rc_adr = min_addr_init();

	rc_lsm = lsm_initcall(pure);



	return (rc_adr ? rc_adr : rc_lsm);

	return lsm_initcall(pure);

}

pure_initcall(security_initcall_pure);

security/min_addr.c

+2 −3
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#include <linux/sysctl.h>

#include <linux/minmax.h>



#include "lsm.h"



/* amount of vm to protect from userspace access by both DAC and the LSM*/

unsigned long mmap_min_addr;

/* amount of vm to protect from userspace using CAP_SYS_RAWIO (DAC) */
@@ -54,10 +52,11 @@ static const struct ctl_table min_addr_sysctl_table[] = { 
	},

};



int __init min_addr_init(void)

static int __init mmap_min_addr_init(void)

{

	register_sysctl_init("vm", min_addr_sysctl_table);

	update_mmap_min_addr();



	return 0;

}

pure_initcall(mmap_min_addr_init);