From: Eric Paris <eparis@redhat.com>
Date: Tue, 12 May 2009 00:47:15 +0000 (-0400)
Subject: securityfs: securityfs_remove should handle IS_ERR pointers
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d93e4c940f51ae06b59c14523c4d55947f9597d6;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

securityfs: securityfs_remove should handle IS_ERR pointers

Both of the securityfs users (TPM and IMA) can call securityfs_remove and pass
an IS_ERR(dentry) in their failure paths.  This patch handles those rather
than panicing when it tries to start deferencing some negative memory.

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
---

diff --git a/security/inode.c b/security/inode.c
index f3b91bfbe4cb..f7496c6a022b 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -287,7 +287,7 @@ void securityfs_remove(struct dentry *dentry)
 {
 	struct dentry *parent;
 
-	if (!dentry)
+	if (!dentry || IS_ERR(dentry))
 		return;
 
 	parent = dentry->d_parent;