Skip to content

Commit 5ebb39e

Browse files
Xiu Jianfengjrjohansen
authored andcommitted
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>
1 parent 8884ba0 commit 5ebb39e

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

security/apparmor/apparmorfs.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,6 @@ SEQ_RAWDATA_FOPS(compressed_size);
13141314

13151315
static int decompress_zstd(char *src, size_t slen, char *dst, size_t dlen)
13161316
{
1317-
#ifdef CONFIG_SECURITY_APPARMOR_EXPORT_BINARY
13181317
if (slen < dlen) {
13191318
const size_t wksp_len = zstd_dctx_workspace_bound();
13201319
zstd_dctx *ctx;
@@ -1341,7 +1340,6 @@ static int decompress_zstd(char *src, size_t slen, char *dst, size_t dlen)
13411340
kvfree(wksp);
13421341
return ret;
13431342
}
1344-
#endif
13451343

13461344
if (dlen < slen)
13471345
return -EINVAL;

0 commit comments

Comments
 (0)