Commit 2ea3d8f6 authored by Xingyuan Mo's avatar Xingyuan Mo Committed by Ziyang Xuan
Browse files

wifi: ath10k: fix NULL pointer dereference in ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev() 

stable inclusion
from stable-v5.10.214
commit e1dc7aa814a95aeeb1b2c05be2b62af8423b15cc
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8QF9K
CVE: CVE-2023-7042

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e1dc7aa814a95aeeb1b2c05be2b62af8423b15cc



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

[ Upstream commit ad25ee36f00172f7d53242dc77c69fff7ced0755 ]

We should check whether the WMI_TLV_TAG_STRUCT_MGMT_TX_COMPL_EVENT tlv is
present before accessing it, otherwise a null pointer deference error will
occur.

Fixes: dc405152 ("ath10k: handle mgmt tx completion event")
Signed-off-by: default avatarXingyuan Mo <hdthky0@gmail.com>
Acked-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20231208043433.271449-1-hdthky0@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZiyang Xuan <william.xuanziyang@huawei.com>
parent f8ab733c

drivers/net/wireless/ath/ath10k/wmi-tlv.c

+4 −0
Original line number Diff line number Diff line
@@ -844,6 +844,10 @@ ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev(struct ath10k *ar, struct sk_buff *skb, 
	}



	ev = tb[WMI_TLV_TAG_STRUCT_MGMT_TX_COMPL_EVENT];

	if (!ev) {

		kfree(tb);

		return -EPROTO;

	}



	arg->desc_id = ev->desc_id;

	arg->status = ev->status;