github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 10:04:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

lsm/stable-6.19 PR 20260202

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCgAyFiEES0KozwfymdVUl37v6iDy2pc3iXMFAmmA0HcUHHBhdWxAcGF1
 bC1tb29yZS5jb20ACgkQ6iDy2pc3iXMPrg/7BPDOeAatY8n+me4BahevlI9MkGBp
 KFwbq2iKObO9lMyp6uJUYz0OpBdUZ7DcTAoaxqbnEKF0qix5IgFJS3Gs3QrG94JN
 kQwJeKkBJDIJum86tQ+ewoLYutGqxraklflbZKJ5c56733MgSJB9S0u/fJrDVOMV
 7HOKnyFFc+o3G2mmc3EW1EWpC33FK/e0ocOTFDXQNYeyo/jTenoxloyG6F+TS3kT
 BTj3KF+25KiX2Isl8SfV/Os8m50AyTUDkMLk3sawt0v1xT5nxGwKFoHa1tftvFpx
 A2LrI6YeZvkD57XXISiFJV1FSjAsMSEbJYmx1HPxQrjXZwxqAaJEnJMqysWuXP/Q
 1smImPcaYIv9kmCDNBLkXtNhjH/P4QCHcwxBfzPm7cLtKg1n8HP/AWn2KbXiyPfO
 hArNp/besQA900FXNHRb0eY1appPoXKK2W0JKmOiY+zS5ASjadNNqJFC7RxoJTeN
 3vdr7lVXHwrpaOtsoWp0RdTbfCdiG2mjsM36DZgTsVt1EvdFM6l6HGSVNjrmQF7q
 zaYVgvqCpulKFOcV6Y0etK8bnYdE3JTskDVWzmMHEidae3zHzVVMKh5BuTnOYBqs
 ZcfiSU/cdnpLzkK6WzEvDClHC4y4i8aII9DR595AZTbSty9h3kAy9Y5qLBObUrIH
 Ai6q0Xp9zFDhzl4=
 =2qEz
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2026-02-02 09:48:23 -08:00
commit dee65f7936
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
security/lsm.h
View File

@ -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

7
security/lsm_init.c
View File

@ -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);

5
security/min_addr.c
View File

@ -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);