apparmor: remove unneeded #ifdef in decompress_zstd()
authorXiu Jianfeng <xiujianfeng@huawei.com>
Wed, 9 Aug 2023 10:02:44 +0000 (10:02 +0000)
committerJohn Johansen <john.johansen@canonical.com>
Mon, 16 Oct 2023 04:44:31 +0000 (21:44 -0700)
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>
security/apparmor/apparmorfs.c

index 0e8d690..37234e3 100644 (file)
@@ -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;