summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnjaneyulu <pagadala.yesu.anjaneyulu@intel.com>2024-02-29 18:16:34 +0200
committeriwlwifi publisher <>2024-04-17 13:01:33 +0000
commitaaa6b786947f8177050201726df1b208677b73da (patch)
treef54d35d4a055c3e1437e5aa22192de1f3027365b
parentaed964507e7ebd5cb99acd70c0f0aee1711ef040 (diff)
downloadbackport-iwlwifi-aaa6b786947f8177050201726df1b208677b73da.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: rfi: fix potential response leak
If the rx payload length check fails, we still need to free the command response. Fix that. type=bugfix fixes=I26d527bf84ce69dadd9185d324a737f90311173c ticket=none Signed-off-by: Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com> Change-Id: Ib6218afb020fb20ee1694ccb6b0dc2fe658d9131 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/96938 automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> 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> Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com> x-iwlwifi-stack-dev: 7158f8e5f42dd64ccbdf0606dccd580b97d326fd
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/rfi.c5
-rw-r--r--versions2
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c b/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
index addcb63152..7fdb7986ef 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
@@ -350,8 +350,11 @@ void *iwl_rfi_get_freq_table(struct iwl_mvm *mvm)
if (ret)
return ERR_PTR(ret);
- if (WARN_ON_ONCE(iwl_rx_packet_payload_len(cmd.resp_pkt) != resp_size))
+ if (WARN_ON_ONCE(iwl_rx_packet_payload_len(cmd.resp_pkt) !=
+ resp_size)) {
+ iwl_free_resp(&cmd);
return ERR_PTR(-EIO);
+ }
resp = kmemdup(cmd.resp_pkt->data, resp_size, GFP_KERNEL);
iwl_free_resp(&cmd);
diff --git a/versions b/versions
index cd173ea05c..7d2d4d6672 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:11958:f4ec698f"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11959:7158f8e5"