diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-28 18:20:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-28 18:20:32 -0700 |
| commit | 30b9dcae9815ae7e752fe3aa00aa283fadf16c6a (patch) | |
| tree | 4054b19b9351c1766b135e1a8cab9f2704ab6923 | |
| parent | 4d40b59d8b0568769d10ac9b2a97e0af0a39d371 (diff) | |
| parent | 5d8b97c946777118930e1cfb075cab59a139ca7c (diff) | |
Merge tag 'lsm-pr-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
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
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | include/linux/security.h | 2 | ||||
| -rw-r--r-- | security/security.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9fcf85f91575..3a9fa3b83b11 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 <nicolas.bouchinet@oss.cyber.gouv.fr> +M: Xiu Jianfeng <xiujianfeng@huawei.com> 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/ diff --git a/include/linux/security.h b/include/linux/security.h index fb72525ddd73..521bcb5b9717 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); diff --git a/security/security.c b/security/security.c index a5766cbf6f7c..ad163f06bf7a 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 |