From: Xiu Jianfeng <xiujianfeng@huawei.com>
Date: Wed, 9 Aug 2023 10:02:44 +0000 (+0000)
Subject: apparmor: remove unneeded #ifdef in decompress_zstd()
X-Git-Tag: v6.7-rc1~81^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ebb39eb90376fbf098df04be8b58f235a14ce5a;p=thirdparty%2Fkernel%2Flinux.git

apparmor: remove unneeded #ifdef in decompress_zstd()

The whole function is guarded by CONFIG_SECURITY_APPARMOR_EXPORT_BINARY,
so the #ifdef here is redundant, remove it.

Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
---

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 0e8d690c911bf..37234e385fd1e 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1314,7 +1314,6 @@ SEQ_RAWDATA_FOPS(compressed_size);
 
 static int decompress_zstd(char *src, size_t slen, char *dst, size_t dlen)
 {
-#ifdef CONFIG_SECURITY_APPARMOR_EXPORT_BINARY
 	if (slen < dlen) {
 		const size_t wksp_len = zstd_dctx_workspace_bound();
 		zstd_dctx *ctx;
@@ -1341,7 +1340,6 @@ cleanup:
 		kvfree(wksp);
 		return ret;
 	}
-#endif
 
 	if (dlen < slen)
 		return -EINVAL;