From 0bb0ef6ed84606a0b8a7261a9fd94238160fa4d3 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Thu, 17 Sep 2020 18:27:38 -0700 Subject: [PATCH] cnss2: Avoid dereferencing pointer before NULL check Only dereference pci_priv pointer after NULL check. Change-Id: I773cb4ae07599b737391ced3e67e4b1ad177b4f1 Signed-off-by: Yue Ma --- drivers/net/wireless/cnss2/pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/cnss2/pci.c b/drivers/net/wireless/cnss2/pci.c index 6f8c9c278adf..8dea57538389 100644 --- a/drivers/net/wireless/cnss2/pci.c +++ b/drivers/net/wireless/cnss2/pci.c @@ -4401,17 +4401,16 @@ static void cnss_dev_rddm_timeout_hdlr(struct timer_list *t) { struct cnss_pci_data *pci_priv = from_timer(pci_priv, t, dev_rddm_timer); - struct mhi_controller *mhi_ctrl = pci_priv->mhi_ctrl; if (!pci_priv) return; cnss_fatal_err("Timeout waiting for RDDM notification\n"); - if (mhi_get_exec_env(mhi_ctrl) == MHI_EE_PBL) + if (mhi_get_exec_env(pci_priv->mhi_ctrl) == MHI_EE_PBL) cnss_pr_err("Unable to collect ramdumps due to abrupt reset\n"); - mhi_debug_reg_dump(mhi_ctrl); + mhi_debug_reg_dump(pci_priv->mhi_ctrl); cnss_schedule_recovery(&pci_priv->pci_dev->dev, CNSS_REASON_TIMEOUT); }