diff options
| author | John Johansen <john.johansen@canonical.com> | 2013-02-19 04:04:34 +0400 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2013-04-28 11:36:09 +0400 |
| commit | 0ca554b9fca425eb58325a36290deef698cef34b (patch) | |
| tree | aa9cd7544db53f617f8bf6b0e441f97a55ed4181 /security/apparmor/include | |
| parent | 3cfcc19e0b5390c04cb5bfa4e8fde39395410e61 (diff) | |
| download | linux-0ca554b9fca425eb58325a36290deef698cef34b.tar.xz | |
apparmor: add kvzalloc to handle zeroing for kvmalloc
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Steve Beattie <sbeattie@ubuntu.com>
Diffstat (limited to 'security/apparmor/include')
| -rw-r--r-- | security/apparmor/include/apparmor.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h index 40aedd9f73ea..1ba2ca56a6ef 100644 --- a/security/apparmor/include/apparmor.h +++ b/security/apparmor/include/apparmor.h @@ -15,6 +15,7 @@ #ifndef __APPARMOR_H #define __APPARMOR_H +#include <linux/slab.h> #include <linux/fs.h> #include "match.h" @@ -64,9 +65,18 @@ extern int apparmor_initialized __initdata; /* fn's in lib */ char *aa_split_fqname(char *args, char **ns_name); void aa_info_message(const char *str); -void *kvmalloc(size_t size); +void *__aa_kvmalloc(size_t size, gfp_t flags); void kvfree(void *buffer); +static inline void *kvmalloc(size_t size) +{ + return __aa_kvmalloc(size, 0); +} + +static inline void *kvzalloc(size_t size) +{ + return __aa_kvmalloc(size, __GFP_ZERO); +} /** * aa_strneq - compare null terminated @str to a non null terminated substring |