aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg2019-11-05 07:50:32 -0600
committerGreg Kroah-Hartman2019-12-31 05:37:46 -0600
commit7a7f55f4cff4c0723b00e9ac11a30ce407f71f53 (patch)
treeb8c0240d27b9ef17a787ee55ee3ee6af2a5163a7
parent21f32d7121560ed0c79fb6887682e731b9839161 (diff)
downloadkernel-7a7f55f4cff4c0723b00e9ac11a30ce407f71f53.tar.gz
kernel-7a7f55f4cff4c0723b00e9ac11a30ce407f71f53.tar.xz
kernel-7a7f55f4cff4c0723b00e9ac11a30ce407f71f53.zip
iwlwifi: check kasprintf() return value
[ Upstream commit 5974fbb5e10b018fdbe3c3b81cb4cc54e1105ab9 ] kasprintf() can fail, we should check the return value. Fixes: 5ed540aecc2a ("iwlwifi: use mac80211 throughput trigger") Fixes: 8ca151b568b6 ("iwlwifi: add the MVM driver") Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/wireless/intel/iwlwifi/dvm/led.c3
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/led.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/led.c b/drivers/net/wireless/intel/iwlwifi/dvm/led.c
index 1bbd17ada974..20e16c423990 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/led.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/led.c
@@ -185,6 +185,9 @@ void iwl_leds_init(struct iwl_priv *priv)
185 185
186 priv->led.name = kasprintf(GFP_KERNEL, "%s-led", 186 priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
187 wiphy_name(priv->hw->wiphy)); 187 wiphy_name(priv->hw->wiphy));
188 if (!priv->led.name)
189 return;
190
188 priv->led.brightness_set = iwl_led_brightness_set; 191 priv->led.brightness_set = iwl_led_brightness_set;
189 priv->led.blink_set = iwl_led_blink_set; 192 priv->led.blink_set = iwl_led_blink_set;
190 priv->led.max_brightness = 1; 193 priv->led.max_brightness = 1;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/led.c b/drivers/net/wireless/intel/iwlwifi/mvm/led.c
index b27269504a62..072f80c90ce4 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/led.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/led.c
@@ -131,6 +131,9 @@ int iwl_mvm_leds_init(struct iwl_mvm *mvm)
131 131
132 mvm->led.name = kasprintf(GFP_KERNEL, "%s-led", 132 mvm->led.name = kasprintf(GFP_KERNEL, "%s-led",
133 wiphy_name(mvm->hw->wiphy)); 133 wiphy_name(mvm->hw->wiphy));
134 if (!mvm->led.name)
135 return -ENOMEM;
136
134 mvm->led.brightness_set = iwl_led_brightness_set; 137 mvm->led.brightness_set = iwl_led_brightness_set;
135 mvm->led.max_brightness = 1; 138 mvm->led.max_brightness = 1;
136 139