aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2006-03-22 03:09:21 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:54:07 -0500
commitcf01efd098597f7ee88a61e645afacba987c4531 (patch)
tree8602df509dc2a2b067063f40084c83a4f698fb15
parentedb20fb5be2ff6943920aca4ccab0f4fdacddb9c (diff)
[PATCH] SELinux: cleanup stray variable in selinux_inode_init_security()
Remove an unneded pointer variable in selinux_inode_init_security(). 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/hooks.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 9ff51c668f06..bdd0b32f0104 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1929,7 +1929,6 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
1929 struct task_security_struct *tsec; 1929 struct task_security_struct *tsec;
1930 struct inode_security_struct *dsec; 1930 struct inode_security_struct *dsec;
1931 struct superblock_security_struct *sbsec; 1931 struct superblock_security_struct *sbsec;
1932 struct inode_security_struct *isec;
1933 u32 newsid, clen; 1932 u32 newsid, clen;
1934 int rc; 1933 int rc;
1935 char *namep = NULL, *context; 1934 char *namep = NULL, *context;
@@ -1937,7 +1936,6 @@ static int selinux_inode_init_security(struct inode *inode, struct inode *dir,
1937 tsec = current->security; 1936 tsec = current->security;
1938 dsec = dir->i_security; 1937 dsec = dir->i_security;
1939 sbsec = dir->i_sb->s_security; 1938 sbsec = dir->i_sb->s_security;
1940 isec = inode->i_security;
1941 1939
1942 if (tsec->create_sid && sbsec->behavior != SECURITY_FS_USE_MNTPOINT) { 1940 if (tsec->create_sid && sbsec->behavior != SECURITY_FS_USE_MNTPOINT) {
1943 newsid = tsec->create_sid; 1941 newsid = tsec->create_sid;