hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apparmor: remove useless aafs_create_symlink 

commit 1180b4c757 ("apparmor: fix dangling symlinks to policy
rawdata after replacement") reworked how the rawdata symlink is
handled but failedto remove aafs_create_symlink which was reduced to a
useles stub.

Fixes: 1180b4c757 ("apparmor: fix dangling symlinks to policy rawdata after replacement")
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2019-09-24 09:46:33 -07:00
parent 6413f852ce
commit a68d59ff4d
1 changed files with 9 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
security/apparmor/apparmorfs.c
View File

@ -340,38 +340,6 @@ static struct dentry *aafs_create_dir(const char *name, struct dentry *parent)
NULL); NULL);
} }
/**
* aafs_create_symlink - create a symlink in the apparmorfs filesystem
* @name: name of dentry to create
* @parent: parent directory for this dentry
* @target: if symlink, symlink target string
* @private: private data
* @iops: struct of inode_operations that should be used
*
* If @target parameter is %NULL, then the @iops parameter needs to be
* setup to handle .readlink and .get_link inode_operations.
*/
static struct dentry *aafs_create_symlink(const char *name,
struct dentry *parent,
const char *target,
void *private,
const struct inode_operations *iops)
{
struct dentry *dent;
char *link = NULL;
if (target) {
if (!link)
return ERR_PTR(-ENOMEM);
}
dent = aafs_create(name, S_IFLNK | 0444, parent, private, link, NULL,
iops);
if (IS_ERR(dent))
kfree(link);
return dent;
}
/** /**
* aafs_remove - removes a file or directory from the apparmorfs filesystem * aafs_remove - removes a file or directory from the apparmorfs filesystem
* *
@ -1762,24 +1730,24 @@ int __aafs_profile_mkdir(struct aa_profile *profile, struct dentry *parent)
} }
if (profile->rawdata) { if (profile->rawdata) {
dent = aafs_create_symlink("raw_sha1", dir, NULL, dent = aafs_create("raw_sha1", S_IFLNK | 0444, dir,
profile->label.proxy, profile->label.proxy, NULL, NULL,
&rawdata_link_sha1_iops); &rawdata_link_sha1_iops);
if (IS_ERR(dent)) if (IS_ERR(dent))
goto fail; goto fail;
aa_get_proxy(profile->label.proxy); aa_get_proxy(profile->label.proxy);
profile->dents[AAFS_PROF_RAW_HASH] = dent; profile->dents[AAFS_PROF_RAW_HASH] = dent;
dent = aafs_create_symlink("raw_abi", dir, NULL, dent = aafs_create("raw_abi", S_IFLNK | 0444, dir,
profile->label.proxy, profile->label.proxy, NULL, NULL,
&rawdata_link_abi_iops); &rawdata_link_abi_iops);
if (IS_ERR(dent)) if (IS_ERR(dent))
goto fail; goto fail;
aa_get_proxy(profile->label.proxy); aa_get_proxy(profile->label.proxy);
profile->dents[AAFS_PROF_RAW_ABI] = dent; profile->dents[AAFS_PROF_RAW_ABI] = dent;
dent = aafs_create_symlink("raw_data", dir, NULL, dent = aafs_create("raw_data", S_IFLNK | 0444, dir,
profile->label.proxy, profile->label.proxy, NULL, NULL,
&rawdata_link_data_iops); &rawdata_link_data_iops);
if (IS_ERR(dent)) if (IS_ERR(dent))
goto fail; goto fail;