diff options
author | David Howells <dhowells@redhat.com> | 2009-09-04 04:19:48 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-09-06 21:39:10 -0400 |
commit | 945af7c3289c26c9070d6b1bf3ca759d36643e0b (patch) | |
tree | cc92de729237da13cf1bf344231ccf619a38d5a3 /include/linux/security.h | |
parent | 6c1488fd581a447ec87c4b59f0d33f95f0aa441b (diff) |
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>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 6 |
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) | |||
2309 | return 0; | 2309 | return 0; |
2310 | } | 2310 | } |
2311 | 2311 | ||
2312 | static inline void security_cred_alloc_blank(struct cred *cred, gfp_t gfp) | 2312 | static inline int security_cred_alloc_blank(struct cred *cred, gfp_t gfp) |
2313 | { } | 2313 | { |
2314 | return 0; | ||
2315 | } | ||
2314 | 2316 | ||
2315 | static inline void security_cred_free(struct cred *cred) | 2317 | static inline void security_cred_free(struct cred *cred) |
2316 | { } | 2318 | { } |