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 /security/security.c | |
| parent | 4d40b59d8b0568769d10ac9b2a97e0af0a39d371 (diff) | |
| parent | 5d8b97c946777118930e1cfb075cab59a139ca7c (diff) | |
| download | linux-30b9dcae9815ae7e752fe3aa00aa283fadf16c6a.tar.gz | |
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
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/security.c b/security/security.c index a5766cbf6f7cc6..ad163f06bf7abc 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 |