projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1575617
)
apparmor: don't check for vmalloc_addr if kvzalloc() failed
author
John Johansen
<john.johansen@canonical.com>
Wed, 15 Jun 2016 06:57:55 +0000
(09:57 +0300)
committer
John Johansen
<john.johansen@canonical.com>
Tue, 12 Jul 2016 15:43:10 +0000
(08:43 -0700)
Signed-off-by: John Johansen <john.johansen@canonical.com>
security/apparmor/match.c
patch
|
blob
|
history
diff --git
a/security/apparmor/match.c
b/security/apparmor/match.c
index
f9f57c6
..
32b72eb
100644
(file)
--- a/
security/apparmor/match.c
+++ b/
security/apparmor/match.c
@@
-75,14
+75,14
@@
static struct table_header *unpack_table(char *blob, size_t bsize)
u32, be32_to_cpu);
else
goto fail;
+ /* if table was vmalloced make sure the page tables are synced
+ * before it is used, as it goes live to all cpus.
+ */
+ if (is_vmalloc_addr(table))
+ vm_unmap_aliases();
}
out:
- /* if table was vmalloced make sure the page tables are synced
- * before it is used, as it goes live to all cpus.
- */
- if (is_vmalloc_addr(table))
- vm_unmap_aliases();
return table;
fail:
kvfree(table);