From: John Johansen <john.johansen@canonical.com>
Date: Tue, 12 Feb 2019 05:56:46 +0000 (-0800)
Subject: apparmor: fix missing ZLIB defines
X-Git-Tag: v5.5-rc1~58^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe166a9f2868839a1e2f7bd950164d05e86eb154;p=thirdparty%2Fkernel%2Flinux.git

apparmor: fix missing ZLIB defines

On configs where ZLIB is not already selected we are getting

undefined reference to `zlib_deflateInit2'
undefined reference to `zlib_deflate'
undefined reference to `zlib_deflateEnd'

For now just select the necessary ZLIB configs.

Fixes: 876dd866c084 ("apparmor: Initial implementation of raw policy blob compression")
Signed-off-by: John Johansen <john.johansen@canonical.com>
---

diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
index 3de21f46c82af..99c35e22c1193 100644
--- a/security/apparmor/Kconfig
+++ b/security/apparmor/Kconfig
@@ -5,6 +5,8 @@ config SECURITY_APPARMOR
 	select SECURITY_PATH
 	select SECURITYFS
 	select SECURITY_NETWORK
+	select ZLIB_INFLATE
+	select ZLIB_DEFLATE
 	default n
 	help
 	  This enables the AppArmor security module.