summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Smalley <sds@epoch.ncsc.mil>2006-02-03 14:21:12 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-04 03:31:33 +0100
commit53ea68ecea11bcbb3451c2758ce181bd97b569a9 (patch)
tree4e754db2a21db5b90a1650f2993d0b76c00cbd53
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 (diff)
downloadlinux-53ea68ecea11bcbb3451c2758ce181bd97b569a9.tar.xz
linux-53ea68ecea11bcbb3451c2758ce181bd97b569a9.zip
[PATCH] SELinux: fix size-128 slab leak
Remove private inode tests from security_inode_alloc and security_inode_free, as we otherwise end up leaking inode security structures for private inodes. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: James Morris <jmorris@namei.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/security.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index bb1da86747c7..7cbef482e13a 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1499,15 +1499,11 @@ static inline void security_sb_post_pivotroot (struct nameidata *old_nd,
static inline int security_inode_alloc (struct inode *inode)
{
- if (unlikely (IS_PRIVATE (inode)))
- return 0;
return security_ops->inode_alloc_security (inode);
}
static inline void security_inode_free (struct inode *inode)
{
- if (unlikely (IS_PRIVATE (inode)))
- return;
security_ops->inode_free_security (inode);
}