Commit f69412d6 authored by wangyuan's avatar wangyuan
Browse files

crypto: hisilicon - replace 'smp_processor_id' with the raw version of the macro 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8WJ1D


CVE: NA

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

smp_processor_id() is unsafe if it's used in a preemption-on critical
section. It will cause the calltrace when the preemption-on and sets the
CONFIG_DEBUG_PREEMPT. So replace 'smp_processor_id' with the raw version
in preemptible to avoid the following calltrace:

[ 7538.874350] BUG: using smp_processor_id() in preemptible [00000000] code: af_alg06/8438
[ 7538.874368] caller is debug_smp_processor_id+0x1c/0x28
[ 7538.874373] CPU: 50 PID: 8438 Comm: af_alg06 Kdump: loaded Not tainted 5.10.0.pc+ #18
[ 7538.874377] Call trace:
[ 7538.874387] dump_backtrace+0x0/0x210
[ 7538.874389] show_stack+0x2c/0x38
[ 7538.874392] dump_stack+0x110/0x164
[ 7538.874392] dump_stack+0x110/0x164
[ 7538.874394] check_preemption_disabled+0xf4/0x108
[ 7538.874396] debug_smp_processor_id+0x1c/0x28
[ 7538.874406] sec_create_qps+0x24/0xe8 [hisi_sec2]
[ 7538.874408] sec_ctx_base_init+0x20/0x4d8 [hisi_sec2]
[ 7538.874411] sec_aead_ctx_init+0x68/0x180 [hisi_sec2]

Signed-off-by: default avatarwangyuan <wangyuan46@huawei.com>
parent deb75da8

drivers/crypto/hisilicon/hpre/hpre_main.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ MODULE_PARM_DESC(vfs_num, "Number of VFs to enable(1-63), 0(default)"); 


struct hisi_qp *hpre_create_qp(void)

{

	int node = cpu_to_node(smp_processor_id());

	int node = cpu_to_node(raw_smp_processor_id());

	struct hisi_qp *qp = NULL;

	int ret;

drivers/crypto/hisilicon/rde/rde_main.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ MODULE_DEVICE_TABLE(pci, hisi_rde_dev_ids); 


struct hisi_qp *rde_create_qp(void)

{

	int node = cpu_to_node(smp_processor_id());

	int node = cpu_to_node(raw_smp_processor_id());

	struct hisi_qp *qp;

	int ret;

drivers/crypto/hisilicon/sec2/sec_main.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ void sec_destroy_qps(struct hisi_qp **qps, int qp_num) 


struct hisi_qp **sec_create_qps(void)

{

	int node = cpu_to_node(smp_processor_id());

	int node = cpu_to_node(raw_smp_processor_id());

	u32 ctx_num = ctx_q_num;

	struct hisi_qp **qps;

	int ret;

drivers/crypto/hisilicon/zip/zip_main.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ MODULE_DEVICE_TABLE(pci, hisi_zip_dev_ids); 


int zip_create_qps(struct hisi_qp **qps, int ctx_num)

{

	int node = cpu_to_node(smp_processor_id());

	int node = cpu_to_node(raw_smp_processor_id());



	return hisi_qm_alloc_qps_node(node, &zip_devices,

					qps, ctx_num, 0);