summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells2009-09-04 10:19:48 +0200
committerJames Morris2009-09-07 03:39:10 +0200
commit945af7c3289c26c9070d6b1bf3ca759d36643e0b (patch)
treecc92de729237da13cf1bf344231ccf619a38d5a3
parentIMA: open new file for read (diff)
downloadkernel-qcow2-linux-945af7c3289c26c9070d6b1bf3ca759d36643e0b.tar.gz
kernel-qcow2-linux-945af7c3289c26c9070d6b1bf3ca759d36643e0b.tar.xz
kernel-qcow2-linux-945af7c3289c26c9070d6b1bf3ca759d36643e0b.zip
KEYS: security_cred_alloc_blank() should return int under all circumstances
Make security_cred_alloc_blank() return int, not void, when CONFIG_SECURITY=n. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--include/linux/security.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 97de3fe3dd0d..f4eb32d5b890 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -2309,8 +2309,10 @@ static inline int security_task_create(unsigned long clone_flags)
return 0;
}
-static inline void security_cred_alloc_blank(struct cred *cred, gfp_t gfp)
-{ }
+static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp)
+{
+ return 0;
+}
static inline void security_cred_free(struct cred *cred)
{ }