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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D1BEDC28CC0 for ; Thu, 30 May 2019 04:24:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C871253D6 for ; Thu, 30 May 2019 04:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559190280; bh=5fioCsNuVKfp+dVL/Jb9n4sQ/DuqOvenb4BPghvFY1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kF6Jkdv8HsBviNLJXuILg6psg4vYeLqKDxmOj1gi0D5L64yLPFvM/8mQThcrhD14j tN07HGru4HeTtbBCAbHxOD5nS61vLGP+q3+pqBHYytZrevCqw4T9XYOY7r1NDtqo8i rMRvsTNB5XxQIbl/TTpP6IkNqeV7oZuowAfX58fI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730082AbfE3EYX (ORCPT ); Thu, 30 May 2019 00:24:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:35142 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729222AbfE3DOw (ORCPT ); Wed, 29 May 2019 23:14:52 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 B476B2457B; Thu, 30 May 2019 03:14:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186091; bh=5fioCsNuVKfp+dVL/Jb9n4sQ/DuqOvenb4BPghvFY1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QphgkamgMg1Y7cnMGizKGI1s4jWPL/qIXX58mAdCigXUP8ULavmyQyNs4drYS1iWN eIultUkcexW6O/x/yqBiD5z5ZvrYKeBHaUb52g0yrnKvdlEIEkfnuaZh3XIg4WzgW0 xiAmnGfJwTkXBBZur/ohCdKBOphDaToeQeYqI05g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Kalle Valo , Sasha Levin Subject: [PATCH 5.0 223/346] rtlwifi: fix a potential NULL pointer dereference Date: Wed, 29 May 2019 20:04:56 -0700 Message-Id: <20190530030552.374046738@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.363386121@linuxfoundation.org> References: <20190530030540.363386121@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 765976285a8c8db3f0eb7f033829a899d0c2786e ] In case alloc_workqueue fails, the fix reports the error and returns to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index ef9b502ce576b..a3189294ecb80 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -469,6 +469,11 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw) /* <2> work queue */ rtlpriv->works.hw = hw; rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name); + if (unlikely(!rtlpriv->works.rtl_wq)) { + pr_err("Failed to allocate work queue\n"); + return; + } + INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq, (void *)rtl_watchdog_wq_callback); INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq, -- 2.20.1