git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ima-memory-use-fixes'
[pandora-kernel.git]
/
security
/
security.c
diff --git
a/security/security.c
b/security/security.c
index
b50f472
..
3ef5e2a
100644
(file)
--- a/
security/security.c
+++ b/
security/security.c
@@
-325,16
+325,8
@@
EXPORT_SYMBOL(security_sb_parse_opts_str);
int security_inode_alloc(struct inode *inode)
{
int security_inode_alloc(struct inode *inode)
{
- int ret;
-
inode->i_security = NULL;
inode->i_security = NULL;
- ret = security_ops->inode_alloc_security(inode);
- if (ret)
- return ret;
- ret = ima_inode_alloc(inode);
- if (ret)
- security_inode_free(inode);
- return ret;
+ return security_ops->inode_alloc_security(inode);
}
void security_inode_free(struct inode *inode)
}
void security_inode_free(struct inode *inode)