diff options
| author | James Morris <jmorris@namei.org> | 2006-03-22 00:09:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 07:54:07 -0800 |
| commit | d6aafa65354cd2dbb089ab9e7dc618f22230fe32 (patch) | |
| tree | b274daf127ac8500229754d9841c8af1547bd66f | |
| parent | 253a8b1db1af146d3a7eef0f3626781df12c7141 (diff) | |
| download | linux-3.10-d6aafa65354cd2dbb089ab9e7dc618f22230fe32.tar.gz linux-3.10-d6aafa65354cd2dbb089ab9e7dc618f22230fe32.tar.bz2 linux-3.10-d6aafa65354cd2dbb089ab9e7dc618f22230fe32.zip | |
[PATCH] selinuxfs cleanups: sel_make_avc_files
Fix copy & paste error in sel_make_avc_files(), removing a supurious call to
d_genocide() in the error path. All of this will be cleaned up by
kill_litter_super().
Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | security/selinux/selinuxfs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index ab7c9935c29..f321c0c49f4 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -1151,22 +1151,19 @@ static int sel_make_avc_files(struct dentry *dir) dentry = d_alloc_name(dir, files[i].name); if (!dentry) { ret = -ENOMEM; - goto err; + goto out; } inode = sel_make_inode(dir->d_sb, S_IFREG|files[i].mode); if (!inode) { ret = -ENOMEM; - goto err; + goto out; } inode->i_fop = files[i].ops; d_add(dentry, inode); } out: return ret; -err: - d_genocide(dir); - goto out; } static int sel_make_dir(struct super_block *sb, struct dentry *dentry) |