summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@linaro.org>2024-02-08 13:17:31 +0300
committeriwlwifi publisher <>2024-04-17 12:43:41 +0000
commit1ec2392287602fa5168ac1a30ae5c1b3a6d2d708 (patch)
tree4e7fd27c19bf39a385f59e7b24dca52b61b0cb53
parent96d76bbbcab7318f6e41dcb39baeac3e0e42642f (diff)
downloadbackport-iwlwifi-1ec2392287602fa5168ac1a30ae5c1b3a6d2d708.tar.gz
[BUGFIX] wifi: iwlwifi: uninitialized variable in iwl_acpi_get_ppag_table()
This is an error path and Smatch complains that "tbl_rev" is uninitialized on this path. All the other functions follow this same patter where they set the error code and goto out_free so that's probably what was intended here as well. type=bugfix ticket=none fixes=I61e64c2758ad178da729ce00428287cc94430eed Fixes: e8e10a37c51c ("iwlwifi: acpi: move ppag code from mvm to fw/acpi") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://msgid.link/09900c01-6540-4a32-9451-563da0029cb6@moroto.mountain Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: I8d20ae2ce117d43fba35033b59ff7332d1901f7a Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/93623 tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> x-iwlwifi-stack-dev: aaaad1d971d789d43e56fe50fccd0fd2a8a2f122
-rw-r--r--drivers/net/wireless/intel/iwlwifi/fw/acpi.c3
-rw-r--r--versions2
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
index 3f7f611699..9cba12ec91 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
@@ -848,6 +848,9 @@ int iwl_acpi_get_ppag_table(struct iwl_fw_runtime *fwrt)
goto read_table;
}
+ ret = PTR_ERR(wifi_pkg);
+ goto out_free;
+
read_table:
fwrt->ppag_ver = tbl_rev;
flags = &wifi_pkg->package.elements[1];
diff --git a/versions b/versions
index d6d02c148d..3d2e92cf6b 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11868:42d7b76b"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11869:aaaad1d9"