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 85302C3276C for ; Thu, 2 Jan 2020 22:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A6102464E for ; Thu, 2 Jan 2020 22:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004118; bh=JmWdkvsqbTXLiuAcRrK4BVTSN7ED4satjx6b3f6/RAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v3AJeriaA2AifqjCUWcrTAcSL4M9kFdk9k5fQj9Uy/HHJtJsGgpVCuLMnoajhJJLW YrT2fMReWF0CBgmKz96VmN1abDYdqzHHpc9wpObpFWa+ymsvDEnux3WM/eW3ZnYbxa QNJpmUony3AVldKs9azRqIw55+jK/MzsNLFvimkQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729473AbgABW2g (ORCPT ); Thu, 2 Jan 2020 17:28:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:58376 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729670AbgABW2b (ORCPT ); Thu, 2 Jan 2020 17:28:31 -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 E65642464E; Thu, 2 Jan 2020 22:28:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004110; bh=JmWdkvsqbTXLiuAcRrK4BVTSN7ED4satjx6b3f6/RAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cb2vvpjQGgP71RxxtHMAUiH85NKCSc30G9qEr3g2QKs+w2GcXgNDt9PHAa5vAZYs6 bc4qQtxO2zmOGGZXvLclr4W0MEGL4Sjx6upiB4tJZ8EEbdNluM30gOtcilrHK0DdGc 66vMCa0/f1uGszuR+UY3J5+/pAv2sX6o8HKR/XtQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Allen Pais , Kalle Valo , Sasha Levin Subject: [PATCH 4.9 014/171] libertas: fix a potential NULL pointer dereference Date: Thu, 2 Jan 2020 23:05:45 +0100 Message-Id: <20200102220548.982792915@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.960200039@linuxfoundation.org> References: <20200102220546.960200039@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: 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 06a57c708992..44da911c9a1a 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 @@ err_activate_card: 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