From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9120BC3276C for ; Thu, 2 Jan 2020 22:37:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5693E22525 for ; Thu, 2 Jan 2020 22:37:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004633; bh=7yEOn4Jd5O+dOTLP0g3C1EaU2y36JagguQ6im/ODAfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZE1MVXnxJ3GxHyORw5lLmT88vr3CkmpV6odwKkU2R9mkNFMTzEeWRVG31GqMSljo3 YXkP3kaX+T4SjDWhDbxqHV/r6xMMXzKAtIq+InAv4hQRAYjGALgIjZUKFfc7FLxB4m u6lKnWQWbsvQNbq7z0M8rZtc9rftZIMD/P2W6Cls= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731057AbgABWhM (ORCPT ); Thu, 2 Jan 2020 17:37:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:49286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731048AbgABWhJ (ORCPT ); Thu, 2 Jan 2020 17:37:09 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6837C22314; Thu, 2 Jan 2020 22:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004628; bh=7yEOn4Jd5O+dOTLP0g3C1EaU2y36JagguQ6im/ODAfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y0g3hstXhYYbdj0IqHBD/s81uX1BCVwPZoTRpsW5nIUzUHZPah74dJLZ2A+86r7dp y3ivVXEewa+Lwl1uS+Ex/PwGW3RvBLYp77SW81+v7bL4ugXLiIZb+fueZ8fU+HmRE4 3ie5Hco0ega9gXk2xzzw9xVO8UPNnyo5HFxmWccA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , Luca Coelho , Sasha Levin Subject: [PATCH 4.4 060/137] iwlwifi: check kasprintf() return value Date: Thu, 2 Jan 2020 23:07:13 +0100 Message-Id: <20200102220554.581199875@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.618583146@linuxfoundation.org> References: <20200102220546.618583146@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ 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 Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- 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