summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2024-02-28 20:31:02 +0100
committeriwlwifi publisher <>2024-04-17 13:01:12 +0000
commita442245d0f1cf920f6850ff690e4e67ac941500f (patch)
tree425b6c46d3d8409c6b480ac5ebbc88d32d2d0cb8
parent109b6a5e659fc46f61724074e6c3640d87087a4d (diff)
downloadbackport-iwlwifi-a442245d0f1cf920f6850ff690e4e67ac941500f.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: rfi: fix potential response leak
If the kmemdup() fails, we still need to free the command response. Fix that. type=bugfix fixes=I26d527bf84ce69dadd9185d324a737f90311173c ticket=none Change-Id: I116293b132502ac68a65527330fa37799694b79c Signed-off-by: Johannes Berg <johannes.berg@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/96675 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: 99a3e91c2696ef553643a7ff0f65822e935b3434
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/rfi.c3
-rw-r--r--versions2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c b/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
index b0d464576c..addcb63152 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c
@@ -354,10 +354,11 @@ void *iwl_rfi_get_freq_table(struct iwl_mvm *mvm)
return ERR_PTR(-EIO);
resp = kmemdup(cmd.resp_pkt->data, resp_size, GFP_KERNEL);
+ iwl_free_resp(&cmd);
+
if (!resp)
return ERR_PTR(-ENOMEM);
- iwl_free_resp(&cmd);
return resp;
}
diff --git a/versions b/versions
index 40dbb8c346..6b2afa67ec 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:11956:71ca810f"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11957:99a3e91c"