diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-29 07:52:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-29 07:52:27 +0100 |
| commit | d1e7f0919ea84911e2ab965418cd502ba6a906e1 (patch) | |
| tree | d9c8211ad10a522d2a98357b563cb87bf32533f3 /include | |
| parent | Merge tag 'docs-5.17-3' of git://git.lwn.net/linux (diff) | |
| parent | security, lsm: dentry_init_security() Handle multi LSM registration (diff) | |
| download | linux-d1e7f0919ea84911e2ab965418cd502ba6a906e1.tar.xz linux-d1e7f0919ea84911e2ab965418cd502ba6a906e1.zip | |
Merge tag 'fixes-v5.17-lsm-ceph-null' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security sybsystem fix from James Morris:
"Fix NULL pointer crash in LSM via Ceph, from Vivek Goyal"
* tag 'fixes-v5.17-lsm-ceph-null' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
security, lsm: dentry_init_security() Handle multi LSM registration
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/lsm_hook_defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h index a5a724c308d8..819ec92dc2a8 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -80,7 +80,7 @@ LSM_HOOK(int, 0, sb_clone_mnt_opts, const struct super_block *oldsb, unsigned long *set_kern_flags) LSM_HOOK(int, 0, move_mount, const struct path *from_path, const struct path *to_path) -LSM_HOOK(int, 0, dentry_init_security, struct dentry *dentry, +LSM_HOOK(int, -EOPNOTSUPP, dentry_init_security, struct dentry *dentry, int mode, const struct qstr *name, const char **xattr_name, void **ctx, u32 *ctxlen) LSM_HOOK(int, 0, dentry_create_files_as, struct dentry *dentry, int mode, |