From d14fbadbf7aa63c38d5fb63e4fe579821b3dc32f Mon Sep 17 00:00:00 2001 From: Manikandan Mohan Date: Fri, 18 Sep 2020 13:05:49 -0700 Subject: [PATCH] cnss2: Initialize params for error path Update driver to initialize and do null checks for variables in error path. Change-Id: I4b012d856decd02dcc3e82d13213ddd529838e98 Signed-off-by: Manikandan Mohan --- drivers/net/wireless/cnss2/main.c | 5 ++++- drivers/net/wireless/cnss2/qmi.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c index 80b7c87e0575..029a6cd09dfe 100644 --- a/drivers/net/wireless/cnss2/main.c +++ b/drivers/net/wireless/cnss2/main.c @@ -323,6 +323,9 @@ int cnss_set_pcie_gen_speed(struct device *dev, u8 pcie_gen_speed) { struct cnss_plat_data *plat_priv = cnss_bus_dev_to_plat_priv(dev); + if (!plat_priv) + return -EINVAL; + if (plat_priv->device_id != QCA6490_DEVICE_ID || !plat_priv->fw_pcie_gen_switch) return -ENOTSUPP; @@ -2245,7 +2248,7 @@ int cnss_minidump_remove_region(struct cnss_plat_data *plat_priv, static int cnss_register_bus_scale(struct cnss_plat_data *plat_priv) { int ret = -EINVAL; - u32 idx, i, j, cfg_arr_size, *cfg_arr; + u32 idx, i, j, cfg_arr_size, *cfg_arr = NULL; struct cnss_bus_bw_info *bus_bw_info, *tmp; struct device *dev = &plat_priv->plat_dev->dev; diff --git a/drivers/net/wireless/cnss2/qmi.c b/drivers/net/wireless/cnss2/qmi.c index 89ddb98d10ed..9c109ebb5f89 100644 --- a/drivers/net/wireless/cnss2/qmi.c +++ b/drivers/net/wireless/cnss2/qmi.c @@ -1300,7 +1300,7 @@ out: int cnss_wlfw_send_pcie_gen_speed_sync(struct cnss_plat_data *plat_priv) { struct wlfw_pcie_gen_switch_req_msg_v01 req; - struct wlfw_pcie_gen_switch_resp_msg_v01 resp; + struct wlfw_pcie_gen_switch_resp_msg_v01 resp = {0}; struct qmi_txn txn; int ret = 0;