Commit d1e7f091 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'fixes-v5.17-lsm-ceph-null' of...

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
parents 246e179d 7f5056b9
...@@ -80,7 +80,7 @@ LSM_HOOK(int, 0, sb_clone_mnt_opts, const struct super_block *oldsb, ...@@ -80,7 +80,7 @@ LSM_HOOK(int, 0, sb_clone_mnt_opts, const struct super_block *oldsb,
unsigned long *set_kern_flags) unsigned long *set_kern_flags)
LSM_HOOK(int, 0, move_mount, const struct path *from_path, LSM_HOOK(int, 0, move_mount, const struct path *from_path,
const struct path *to_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, int mode, const struct qstr *name, const char **xattr_name,
void **ctx, u32 *ctxlen) void **ctx, u32 *ctxlen)
LSM_HOOK(int, 0, dentry_create_files_as, struct dentry *dentry, int mode, LSM_HOOK(int, 0, dentry_create_files_as, struct dentry *dentry, int mode,
......
...@@ -1048,8 +1048,19 @@ int security_dentry_init_security(struct dentry *dentry, int mode, ...@@ -1048,8 +1048,19 @@ int security_dentry_init_security(struct dentry *dentry, int mode,
const char **xattr_name, void **ctx, const char **xattr_name, void **ctx,
u32 *ctxlen) u32 *ctxlen)
{ {
return call_int_hook(dentry_init_security, -EOPNOTSUPP, dentry, mode, struct security_hook_list *hp;
name, xattr_name, ctx, ctxlen); int rc;
/*
* Only one module will provide a security context.
*/
hlist_for_each_entry(hp, &security_hook_heads.dentry_init_security, list) {
rc = hp->hook.dentry_init_security(dentry, mode, name,
xattr_name, ctx, ctxlen);
if (rc != LSM_RET_DEFAULT(dentry_init_security))
return rc;
}
return LSM_RET_DEFAULT(dentry_init_security);
} }
EXPORT_SYMBOL(security_dentry_init_security); EXPORT_SYMBOL(security_dentry_init_security);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment