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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,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 2B927C46470 for ; Sat, 1 Jun 2019 13:17:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F032427251 for ; Sat, 1 Jun 2019 13:17:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395031; bh=ODfp8jxc5ne6xwedr1RUz4fhd+Pxzup3hNIbD9QDFfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=02kWCzl9ngJPGA2w0VHvcPJ9KjK9qEPgDYjO21TxT05DQdcKzUpWxGIJHzDLjYMEx 4kDQG8JRAKSWV7mS3c/7gxbbKvx+6jOzsjuzG44uyXROQY4D8+IYk7KHg6JnBnGH1N yBjzFYrQ6LwGRt5nBgx7TUoGAzsU3f4USM1TM6B8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727298AbfFANRI (ORCPT ); Sat, 1 Jun 2019 09:17:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:41828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726210AbfFANRG (ORCPT ); Sat, 1 Jun 2019 09:17:06 -0400 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 9A8C427256; Sat, 1 Jun 2019 13:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395025; bh=ODfp8jxc5ne6xwedr1RUz4fhd+Pxzup3hNIbD9QDFfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D9vLrNxXyxARAXGq6IrdcNSCT+Bm44+moayj2mT+RI8gGGQhd9vFNtrJvESivQ+pU 2z3BMRd9b3bfzIM51/qKqm7y+2Nl7VJjB/fm9Kv83oojULjqsC6j2EpMjSBj1OUs53 sdHh/InnQEZ21cWnCRxhG0rmV6tW4nI+fsENq/rI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , Alexandre Bounine , Matt Porter , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 5.1 003/186] rapidio: fix a NULL pointer dereference when create_workqueue() fails Date: Sat, 1 Jun 2019 09:13:39 -0400 Message-Id: <20190601131653.24205-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190601131653.24205-1-sashal@kernel.org> References: <20190601131653.24205-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: Kangjie Lu [ Upstream commit 23015b22e47c5409620b1726a677d69e5cd032ba ] In case create_workqueue fails, the fix releases resources and returns -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu Acked-by: Alexandre Bounine Cc: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- drivers/rapidio/rio_cm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/rapidio/rio_cm.c b/drivers/rapidio/rio_cm.c index cf45829585cb4..b29fc258eeba4 100644 --- a/drivers/rapidio/rio_cm.c +++ b/drivers/rapidio/rio_cm.c @@ -2147,6 +2147,14 @@ static int riocm_add_mport(struct device *dev, mutex_init(&cm->rx_lock); riocm_rx_fill(cm, RIOCM_RX_RING_SIZE); cm->rx_wq = create_workqueue(DRV_NAME "/rxq"); + if (!cm->rx_wq) { + riocm_error("failed to allocate IBMBOX_%d on %s", + cmbox, mport->name); + rio_release_outb_mbox(mport, cmbox); + kfree(cm); + return -ENOMEM; + } + INIT_WORK(&cm->rx_work, rio_ibmsg_handler); cm->tx_slot = 0; -- 2.20.1