Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 59215
b: refs/heads/master
c: 0c92d7c
h: refs/heads/master
i:
  59213: ec99a45
  59211: 6b291ea
  59207: a1fe5e0
  59199: 3e51da3
v: v3
  • Loading branch information
Christopher J. PeBenito authored and James Morris committed Jul 12, 2007
1 parent a0adfc5 commit 7f03ccb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 55fcf09b3fe4325c9395ebbb0322a547a157ebc7
refs/heads/master: 0c92d7c73b6f99897c8bc7990717b9050cfc722f
9 changes: 4 additions & 5 deletions trunk/security/selinux/selinuxfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -940,9 +940,8 @@ static const struct file_operations sel_commit_bools_ops = {
.write = sel_commit_bools_write,
};

/* delete booleans - partial revoke() from
* fs/proc/generic.c proc_kill_inodes */
static void sel_remove_bools(struct dentry *de)
/* partial revoke() from fs/proc/generic.c proc_kill_inodes */
static void sel_remove_entries(struct dentry *de)
{
struct list_head *p, *node;
struct super_block *sb = de->d_sb;
Expand Down Expand Up @@ -998,7 +997,7 @@ static int sel_make_bools(void)
kfree(bool_pending_values);
bool_pending_values = NULL;

sel_remove_bools(dir);
sel_remove_entries(dir);

if (!(page = (char*)get_zeroed_page(GFP_KERNEL)))
return -ENOMEM;
Expand Down Expand Up @@ -1048,7 +1047,7 @@ static int sel_make_bools(void)
return ret;
err:
kfree(values);
sel_remove_bools(dir);
sel_remove_entries(dir);
ret = -ENOMEM;
goto out;
}
Expand Down

0 comments on commit 7f03ccb

Please sign in to comment.