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

30b9dcae · Linus Torvalds <[email protected]> · 2025-07-28 18:20:32 -07:00

Pull lsm updates from Paul Moore:

 - Add Nicolas Bouchinet and Xiu Jianfeng as Lockdown maintainers

   The Lockdown LSM has been without a dedicated mantainer since its
   original acceptance upstream, and it has suffered as a result.
   Thankfully we have two new volunteers who together I believe have the
   background and desire to help ensure Lockdown is properly supported.

 - Remove the unused cap_mmap_file() declaration

* tag 'lsm-pr-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm:
  MAINTAINERS: Add Xiu and myself as Lockdown maintainers
  security: Remove unused declaration cap_mmap_file()
  lsm: trivial comment fix

Commit: 30b9dcae9815ae7e752fe3aa00aa283fadf16c6a
Parents: 4d40b59d · 5d8b97c9

Merge commit. Changes below are compared with the first parent: 4d40b59d.

Changes

3 files changed · +4 −4

File	Status	Add	Del	Content
MAINTAINERS	modified	+3	−1	View file
include/linux/security.h	modified	+0	−2	View file
security/security.c	modified	+1	−1	View file

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 9fcf85f..3a9fa3b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14067,8 +14067,10 @@ F:	Documentation/admin-guide/LSM/LoadPin.rst
 F:	security/loadpin/
 
 LOCKDOWN SECURITY MODULE
+M:	Nicolas Bouchinet <[email protected]>
+M:	Xiu Jianfeng <[email protected]>
 L:	[email protected]
-S:	Odd Fixes
+S:	Maintained
 T:	git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git
 F:	security/lockdown/
 

include/linux/security.h

View file

diff --git a/include/linux/security.h b/include/linux/security.h
index fb72525..521bcb5 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -193,8 +193,6 @@ int cap_inode_getsecurity(struct mnt_idmap *idmap,
 			  struct inode *inode, const char *name, void **buffer,
 			  bool alloc);
 extern int cap_mmap_addr(unsigned long addr);
-extern int cap_mmap_file(struct file *file, unsigned long reqprot,
-			 unsigned long prot, unsigned long flags);
 extern int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags);
 extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
 			  unsigned long arg4, unsigned long arg5);

security/security.c

View file

diff --git a/security/security.c b/security/security.c
index a5766cb..ad163f0 100644
--- a/security/security.c
+++ b/security/security.c
@@ -2181,7 +2181,7 @@ int security_inode_symlink(struct inode *dir, struct dentry *dentry,
 }
 
 /**
- * security_inode_mkdir() - Check if creation a new director is allowed
+ * security_inode_mkdir() - Check if creating a new directory is allowed
  * @dir: parent directory
  * @dentry: new directory
  * @mode: new directory mode