diff options
| author | John Johansen <john.johansen@canonical.com> | 2016-06-15 09:57:55 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2017-01-27 11:16:13 +0100 |
| commit | 66bffcb518fcb98d0c6e34fc9b6d11373e696b0d (patch) | |
| tree | b3c386b2b8eb60280a75af5d064d053274351c8f | |
| parent | 1e612988489ab3ec2d2949161ebe498d29bf9940 (diff) | |
| download | linux-stable-66bffcb518fcb98d0c6e34fc9b6d11373e696b0d.tar.gz linux-stable-66bffcb518fcb98d0c6e34fc9b6d11373e696b0d.tar.bz2 linux-stable-66bffcb518fcb98d0c6e34fc9b6d11373e696b0d.zip | |
apparmor: don't check for vmalloc_addr if kvzalloc() failed
commit 3197f5adf539a3ee6331f433a51483f8c842f890 upstream.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | security/apparmor/match.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/security/apparmor/match.c b/security/apparmor/match.c index f9f57c626f54..32b72eb3d988 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); |