diff options
| author | Casey Schaufler <casey@schaufler-ca.com> | 2012-05-23 17:46:58 -0700 |
|---|---|---|
| committer | Casey Schaufler <casey@schaufler-ca.com> | 2012-07-13 15:49:23 -0700 |
| commit | eb982cb4cf6405b97ea1f9e1d10864981f269d46 (patch) | |
| tree | 8d89448e0ef96d587ea8052021a721e632b4b318 /security/smack/smack.h | |
| parent | 417c6c8ee2eb6975f357d8975af94ba5fbeaf82d (diff) | |
| download | linux-3.10-eb982cb4cf6405b97ea1f9e1d10864981f269d46.tar.gz linux-3.10-eb982cb4cf6405b97ea1f9e1d10864981f269d46.tar.bz2 linux-3.10-eb982cb4cf6405b97ea1f9e1d10864981f269d46.zip | |
Smack: fix smack_new_inode bogosities
In January of 2012 Al Viro pointed out three bits of code that
he titled "new_inode_smack bogosities". This patch repairs these
errors.
1. smack_sb_kern_mount() included a NULL check that is impossible.
The check and NULL case are removed.
2. smack_kb_kern_mount() included pointless locking. The locking is
removed. Since this is the only place that lock was used the lock
is removed from the superblock_smack structure.
3. smk_fill_super() incorrectly and unnecessarily set the Smack label
for the smackfs root inode. The assignment has been removed.
Targeted for git://gitorious.org/smack-next/kernel.git
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Diffstat (limited to 'security/smack/smack.h')
| -rw-r--r-- | security/smack/smack.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index cc361b8f3d1..76feb31eb82 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h @@ -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 { |