From: Linus Torvalds Date: Sat, 29 Jan 2022 06:52:27 +0000 (+0200) Subject: Merge tag 'fixes-v5.17-lsm-ceph-null' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v6.6.17~8290 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1e7f0919ea84911e2ab965418cd502ba6a906e1;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'fixes-v5.17-lsm-ceph-null' of git://git./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 --- d1e7f0919ea84911e2ab965418cd502ba6a906e1 diff --cc include/linux/lsm_hook_defs.h index a5a724c,f0c7b352..819ec92 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@@ -78,9 -78,11 +78,9 @@@ LSM_HOOK(int, 0, sb_set_mnt_opts, struc LSM_HOOK(int, 0, sb_clone_mnt_opts, const struct super_block *oldsb, struct super_block *newsb, unsigned long kern_flags, unsigned long *set_kern_flags) -LSM_HOOK(int, 0, sb_add_mnt_opt, const char *option, const char *val, - int len, void **mnt_opts) 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,