diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 13:24:24 +1100 |
| commit | 7f36522fa5c8192dccee0f0a414f1b7b336b9c87 (patch) | |
| tree | 443ab002a359443792f43c48790e91539a01e4d4 /security/apparmor/apparmorfs.c | |
| parent | bab31490ee78b5c5531bae6d54d411a49d2c2f30 (diff) | |
| parent | 28415881a8fced951563443d0a95f9f14cea8687 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'security/apparmor/apparmorfs.c')
| -rw-r--r-- | security/apparmor/apparmorfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 41073f70eb41..be0b49897a67 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -98,7 +98,7 @@ static struct aa_loaddata *aa_simple_write_to_buffer(const char __user *userbuf, return ERR_PTR(-ESPIPE); /* freed by caller to simple_write_to_buffer */ - data = kvmalloc(sizeof(*data) + alloc_size); + data = kvmalloc(sizeof(*data) + alloc_size, GFP_KERNEL); if (data == NULL) return ERR_PTR(-ENOMEM); kref_init(&data->count); |