Commit 5ebb39eb authored by Xiu Jianfeng's avatar Xiu Jianfeng Committed by John Johansen

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: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 8884ba07
...@@ -1314,7 +1314,6 @@ SEQ_RAWDATA_FOPS(compressed_size); ...@@ -1314,7 +1314,6 @@ SEQ_RAWDATA_FOPS(compressed_size);
static int decompress_zstd(char *src, size_t slen, char *dst, size_t dlen) static int decompress_zstd(char *src, size_t slen, char *dst, size_t dlen)
{ {
#ifdef CONFIG_SECURITY_APPARMOR_EXPORT_BINARY
if (slen < dlen) { if (slen < dlen) {
const size_t wksp_len = zstd_dctx_workspace_bound(); const size_t wksp_len = zstd_dctx_workspace_bound();
zstd_dctx *ctx; zstd_dctx *ctx;
...@@ -1341,7 +1340,6 @@ static int decompress_zstd(char *src, size_t slen, char *dst, size_t dlen) ...@@ -1341,7 +1340,6 @@ static int decompress_zstd(char *src, size_t slen, char *dst, size_t dlen)
kvfree(wksp); kvfree(wksp);
return ret; return ret;
} }
#endif
if (dlen < slen) if (dlen < slen)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment