lkml.org 
[lkml]   [2020]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 060/137] iwlwifi: check kasprintf() return value
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ 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>
    ---
    drivers/net/wireless/iwlwifi/dvm/led.c | 3 +++
    drivers/net/wireless/iwlwifi/mvm/led.c | 3 +++
    2 files changed, 6 insertions(+)

    diff --git a/drivers/net/wireless/iwlwifi/dvm/led.c b/drivers/net/wireless/iwlwifi/dvm/led.c
    index ca4d6692cc4e..47e5fa70483d 100644
    --- a/drivers/net/wireless/iwlwifi/dvm/led.c
    +++ b/drivers/net/wireless/iwlwifi/dvm/led.c
    @@ -184,6 +184,9 @@ void iwl_leds_init(struct iwl_priv *priv)

    priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
    wiphy_name(priv->hw->wiphy));
    + if (!priv->led.name)
    + return;
    +
    priv->led.brightness_set = iwl_led_brightness_set;
    priv->led.blink_set = iwl_led_blink_set;
    priv->led.max_brightness = 1;
    diff --git a/drivers/net/wireless/iwlwifi/mvm/led.c b/drivers/net/wireless/iwlwifi/mvm/led.c
    index e3b3cf4dbd77..948be43e4d26 100644
    --- a/drivers/net/wireless/iwlwifi/mvm/led.c
    +++ b/drivers/net/wireless/iwlwifi/mvm/led.c
    @@ -109,6 +109,9 @@ int iwl_mvm_leds_init(struct iwl_mvm *mvm)

    mvm->led.name = kasprintf(GFP_KERNEL, "%s-led",
    wiphy_name(mvm->hw->wiphy));
    + if (!mvm->led.name)
    + return -ENOMEM;
    +
    mvm->led.brightness_set = iwl_led_brightness_set;
    mvm->led.max_brightness = 1;

    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-02 23:37    [W:2.805 / U:0.828 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site