From: John Johansen <john.johansen@canonical.com>
Date: Wed, 15 Jun 2016 06:57:55 +0000 (+0300)
Subject: apparmor: don't check for vmalloc_addr if kvzalloc() failed
X-Git-Tag: v3.12.70~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66bffcb518fcb98d0c6e34fc9b6d11373e696b0d;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/security/apparmor/match.c b/security/apparmor/match.c
index f9f57c626f549..32b72eb3d988e 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);