Commit a37d3b54 authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Zheng Zengkai
Browse files

crypto: hisilicon/hpre - don't use GFP_KERNEL to alloc mem during softirq 

mainline inclusion
from mainline-master
commit 98dfa934
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5MK7S
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=98dfa9343f37



----------------------------------------------------------------------

The hpre encryption driver may be used to encrypt and decrypt packets
during the rx softirq, it is not allowed to use GFP_KERNEL.

Fixes: c8b4b477 ("crypto: hisilicon - add HiSilicon HPRE accelerator")
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJiangshui Yang <yangjiangshui@h-partners.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f3d257b5

drivers/crypto/hisilicon/hpre/hpre_crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int hpre_prepare_dma_buf(struct hpre_asym_request *hpre_req, 
	if (unlikely(shift < 0))

		return -EINVAL;



	ptr = dma_alloc_coherent(dev, ctx->key_sz, tmp, GFP_KERNEL);

	ptr = dma_alloc_coherent(dev, ctx->key_sz, tmp, GFP_ATOMIC);

	if (unlikely(!ptr))

		return -ENOMEM;