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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 9B507C43603 for ; Tue, 10 Dec 2019 22:44:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 678422053B for ; Tue, 10 Dec 2019 22:44:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017896; bh=Tot2xLvEJNbuTrMWA9fOxewwcqxG3Aa/rywOJS1Vi6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SycpxGJrh/LtpzFtYprav/gysQ3owqAj/cQm3CF4tZY9Yi/hvyayHZfOxoCjtvKm+ rVoR+eW52RqnCwGR9AnWTh3fA0NtXLqHhYHrrVDybZJtUnmqLP5NaXXiIIYnc2E7aO +LBBDCpoJoeKh7eOCKJwhcBiIWKiuZw3DkYLXet0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727788AbfLJWoz (ORCPT ); Tue, 10 Dec 2019 17:44:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:50602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727300AbfLJWas (ORCPT ); Tue, 10 Dec 2019 17:30:48 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 601BD208C3; Tue, 10 Dec 2019 22:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017048; bh=Tot2xLvEJNbuTrMWA9fOxewwcqxG3Aa/rywOJS1Vi6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OfmdakgJa6gqHY9RHKxYw1YZJsMvaQJ4UbPQIvKLic8DXyXbrKZUlpN7P87vt7pGm v9ypPWxgemroBPjob9X+D/VV7UTaPE3UBEXZr1RA1hskcrlyoqh9DOrMzKGGLSUudi RYUYSLHcIJooH6qpeVqzfK5ftz+E9Uv3n1SHMCSM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Allen Pais , Kalle Valo , Sasha Levin , libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 10/91] libertas: fix a potential NULL pointer dereference Date: Tue, 10 Dec 2019 17:29:14 -0500 Message-Id: <20191210223035.14270-10-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210223035.14270-1-sashal@kernel.org> References: <20191210223035.14270-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Allen Pais [ Upstream commit 7da413a18583baaf35dd4a8eb414fa410367d7f2 ] alloc_workqueue is not checked for errors and as a result, a potential NULL dereference could occur. Signed-off-by: Allen Pais Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/marvell/libertas/if_sdio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c index 06a57c7089920..44da911c9a1a8 100644 --- a/drivers/net/wireless/marvell/libertas/if_sdio.c +++ b/drivers/net/wireless/marvell/libertas/if_sdio.c @@ -1229,6 +1229,10 @@ static int if_sdio_probe(struct sdio_func *func, spin_lock_init(&card->lock); card->workqueue = alloc_workqueue("libertas_sdio", WQ_MEM_RECLAIM, 0); + if (unlikely(!card->workqueue)) { + ret = -ENOMEM; + goto err_queue; + } INIT_WORK(&card->packet_worker, if_sdio_host_to_card_worker); init_waitqueue_head(&card->pwron_waitq); @@ -1282,6 +1286,7 @@ static int if_sdio_probe(struct sdio_func *func, lbs_remove_card(priv); free: destroy_workqueue(card->workqueue); +err_queue: while (card->packets) { packet = card->packets; card->packets = card->packets->next; -- 2.20.1