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 1181DC28CC5 for ; Sat, 8 Jun 2019 11:52:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5D3E21537 for ; Sat, 8 Jun 2019 11:52:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559994760; bh=6ZqSkqUfSiHWlEmWK7T0Wo1G2xB0Sqd74l/iyst+E5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FTHjGC5L7X4d+FV9AHSjpmNUmIgjeRzxT+wHlSsZkDWADearH5I+L46ZWreajT5bo +F/rO1Uo3cQsOqWtTf4ZiXLWwiZ+98MA4k2OotpduCKacGwq7SiEhYaxiuTxuqv72f 1FuCXYBk8PHkCFLezx+ECy/6ScYfG8Ba5KfZztGE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728045AbfFHLwj (ORCPT ); Sat, 8 Jun 2019 07:52:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:59456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728291AbfFHLmK (ORCPT ); Sat, 8 Jun 2019 07:42:10 -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 1533C214AF; Sat, 8 Jun 2019 11:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559994129; bh=6ZqSkqUfSiHWlEmWK7T0Wo1G2xB0Sqd74l/iyst+E5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pid24HwReedYkdDfoGWq5bIEpZlS/ecl7jY6IRbQGh6QAsGk3xyrs4i7UkftWqUSJ 0oy6j+HofV0BdO09F0CyoJmuGSihzaBbdmYxr6YwV6v1ZocDA4toxiok7oMbxeScjY VN55bZfwy0oVEScN6xaS5f1N8aPtXeyNmxGhIOnI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jes Sorensen , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 60/70] blk-mq: Fix memory leak in error handling Date: Sat, 8 Jun 2019 07:39:39 -0400 Message-Id: <20190608113950.8033-60-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190608113950.8033-1-sashal@kernel.org> References: <20190608113950.8033-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Jes Sorensen [ Upstream commit 41de54c64811bf087c8464fdeb43c6ad8be2686b ] If blk_mq_init_allocated_queue() fails, make sure to free the poll stat callback struct allocated. Signed-off-by: Jes Sorensen Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-mq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 8a41cc5974fe..95e8005982cd 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2844,7 +2844,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, goto err_exit; if (blk_mq_alloc_ctxs(q)) - goto err_exit; + goto err_poll; /* init q->mq_kobj and sw queues' kobjects */ blk_mq_sysfs_init(q); @@ -2905,6 +2905,9 @@ err_hctxs: kfree(q->queue_hw_ctx); err_sys_init: blk_mq_sysfs_deinit(q); +err_poll: + blk_stat_free_callback(q->poll_cb); + q->poll_cb = NULL; err_exit: q->mq_ops = NULL; return ERR_PTR(-ENOMEM); -- 2.20.1