Unverified Commit 2c75e3e9 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10130 wifi: iwlwifi: mvm: don't read past the mfuart notifcation 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/X6KXBFQJ4ZB2OQZ4WNA44OOO7RV7CN44/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACQYV 
 
Link:https://gitee.com/openeuler/kernel/pulls/10130

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents c201e72d ea21b784

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+0 −10
Original line number Diff line number Diff line
@@ -195,20 +195,10 @@ void iwl_mvm_mfu_assert_dump_notif(struct iwl_mvm *mvm, 
{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_mfu_assert_dump_notif *mfu_dump_notif = (void *)pkt->data;

	__le32 *dump_data = mfu_dump_notif->data;

	int n_words = le32_to_cpu(mfu_dump_notif->data_size) / sizeof(__le32);

	int i;



	if (mfu_dump_notif->index_num == 0)

		IWL_INFO(mvm, "MFUART assert id 0x%x occurred\n",

			 le32_to_cpu(mfu_dump_notif->assert_id));



	for (i = 0; i < n_words; i++)

		IWL_DEBUG_INFO(mvm,

			       "MFUART assert dump, dword %u: 0x%08x\n",

			       le16_to_cpu(mfu_dump_notif->index_num) *

			       n_words + i,

			       le32_to_cpu(dump_data[i]));

}



static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,