mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
dafcbfb4b6
patches 0001-0022 are backports of fixes from the 4.8 pull-request 0023-0025 are the out of tree feature patches Signed-off-by: John Johansen <john.johansen@canonical.com>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From c7f87d3c3363b1a0c4724e627e5c8e640a883c89 Mon Sep 17 00:00:00 2001
|
|
From: John Johansen <john.johansen@canonical.com>
|
|
Date: Wed, 15 Jun 2016 09:57:55 +0300
|
|
Subject: [PATCH 18/25] apparmor: don't check for vmalloc_addr if kvzalloc()
|
|
failed
|
|
|
|
Signed-off-by: John Johansen <john.johansen@canonical.com>
|
|
---
|
|
security/apparmor/match.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/security/apparmor/match.c b/security/apparmor/match.c
|
|
index f9f57c6..32b72eb 100644
|
|
--- 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);
|
|
--
|
|
2.7.4
|
|
|