From 9fc86a85f36c51dd9e628c82091326151c8ff638 Mon Sep 17 00:00:00 2001 From: Kalevi Kolttonen Date: Thu, 15 May 2025 23:23:40 +0300 Subject: [PATCH 1/3] lsm: trivial comment fix Fix a typo in the security_inode_mkdir() comment block. Signed-off-by: Kalevi Kolttonen [PM: subject tweak, add description] Signed-off-by: Paul Moore --- security/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/security.c b/security/security.c index 596d41818577..fc8405928cc7 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 From f3128dd6762d71ec92ae888bf582a5f751c3f2e0 Mon Sep 17 00:00:00 2001 From: Yue Haibing Date: Tue, 24 Jun 2025 09:41:08 +0800 Subject: [PATCH 2/3] security: Remove unused declaration cap_mmap_file() Commit 3f4f1f8a1ab7 ("capabilities: remove cap_mmap_file()") removed the implementation but leave declaration. Signed-off-by: Yue Haibing Reviewed-by: Serge Hallyn Signed-off-by: Paul Moore --- include/linux/security.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/security.h b/include/linux/security.h index dba349629229..e8d9f6069f0c 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); From 5d8b97c946777118930e1cfb075cab59a139ca7c Mon Sep 17 00:00:00 2001 From: Nicolas Bouchinet Date: Tue, 24 Jun 2025 16:48:51 +0200 Subject: [PATCH 3/3] MAINTAINERS: Add Xiu and myself as Lockdown maintainers The Lockdown LSM has been unmaintained for some time now. It requires some work to ensure it works as intended. Xiu Jianfeng and I volunteer to maintain the LSM. Signed-off-by: Nicolas Bouchinet Acked-by: Xiu Jianfeng Signed-off-by: Paul Moore --- MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0c1d245bf7b8..776c7fffcaec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14060,8 +14060,10 @@ F: Documentation/admin-guide/LSM/LoadPin.rst F: security/loadpin/ LOCKDOWN SECURITY MODULE +M: Nicolas Bouchinet +M: Xiu Jianfeng L: linux-security-module@vger.kernel.org -S: Odd Fixes +S: Maintained T: git https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git F: security/lockdown/