diff options
author | John Johansen | 2017-05-25 15:31:46 +0200 |
---|---|---|
committer | John Johansen | 2017-06-08 21:51:52 +0200 |
commit | 98407f0a0d378df27bfea79301a3aba42d7cea1c (patch) | |
tree | 402c0ff7608565ce409eed578905be45c14e651f /security/apparmor/include/apparmorfs.h | |
parent | apparmor: rename apparmor file fns and data to indicate use (diff) | |
download | kernel-qcow2-linux-98407f0a0d378df27bfea79301a3aba42d7cea1c.tar.gz kernel-qcow2-linux-98407f0a0d378df27bfea79301a3aba42d7cea1c.tar.xz kernel-qcow2-linux-98407f0a0d378df27bfea79301a3aba42d7cea1c.zip |
apparmor: allow specifying an already created dir to create ns entries in
Signed-off-by: John Johansen <john.johansen@canonical.com>
Reviewed-by: Seth Arnold <seth.arnold@canonical.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'security/apparmor/include/apparmorfs.h')
-rw-r--r-- | security/apparmor/include/apparmorfs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/include/apparmorfs.h b/security/apparmor/include/apparmorfs.h index bcad87740cb6..071a59a1f056 100644 --- a/security/apparmor/include/apparmorfs.h +++ b/security/apparmor/include/apparmorfs.h @@ -112,8 +112,8 @@ void __aafs_profile_migrate_dents(struct aa_profile *old, struct aa_profile *new); int __aafs_profile_mkdir(struct aa_profile *profile, struct dentry *parent); void __aafs_ns_rmdir(struct aa_ns *ns); -int __aafs_ns_mkdir(struct aa_ns *ns, struct dentry *parent, - const char *name); +int __aafs_ns_mkdir(struct aa_ns *ns, struct dentry *parent, const char *name, + struct dentry *dent); struct aa_loaddata; void __aa_fs_remove_rawdata(struct aa_loaddata *rawdata); |