Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313616
b: refs/heads/master
c: eb982cb
h: refs/heads/master
v: v3
  • Loading branch information
Casey Schaufler committed Jul 13, 2012
1 parent 095d322 commit 6ae85e6
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 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: 417c6c8ee2eb6975f357d8975af94ba5fbeaf82d
refs/heads/master: eb982cb4cf6405b97ea1f9e1d10864981f269d46
1 change: 0 additions & 1 deletion trunk/security/smack/smack.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ struct superblock_smack {
char *smk_hat;
char *smk_default;
int smk_initialized;
spinlock_t smk_sblock; /* for initialization */
};

struct socket_smack {
Expand Down
8 changes: 2 additions & 6 deletions trunk/security/smack/smack_lsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,6 @@ static int smack_sb_alloc_security(struct super_block *sb)
sbsp->smk_floor = smack_known_floor.smk_known;
sbsp->smk_hat = smack_known_hat.smk_known;
sbsp->smk_initialized = 0;
spin_lock_init(&sbsp->smk_sblock);

sb->s_security = sbsp;

Expand Down Expand Up @@ -332,13 +331,10 @@ static int smack_sb_kern_mount(struct super_block *sb, int flags, void *data)
char *commap;
char *nsp;

spin_lock(&sp->smk_sblock);
if (sp->smk_initialized != 0) {
spin_unlock(&sp->smk_sblock);
if (sp->smk_initialized != 0)
return 0;
}

sp->smk_initialized = 1;
spin_unlock(&sp->smk_sblock);

for (op = data; op != NULL; op = commap) {
commap = strchr(op, ',');
Expand Down
1 change: 0 additions & 1 deletion trunk/security/smack/smackfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -2051,7 +2051,6 @@ static int smk_fill_super(struct super_block *sb, void *data, int silent)
}

root_inode = sb->s_root->d_inode;
root_inode->i_security = new_inode_smack(smack_known_floor.smk_known);

return 0;
}
Expand Down

0 comments on commit 6ae85e6

Please sign in to comment.