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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 245B1C282CE for ; Wed, 24 Apr 2019 14:38:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFF3A218FE for ; Wed, 24 Apr 2019 14:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556116733; bh=lm+4iFGynmvL/NpmlreNqT87c33oZ99Ef5IuOGAoM2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YmCAILZo7dU/f6Ix6vADYsqPEG2vEix7phDRJg/pav9FDvduYrP1OrNw0pg4+deSt GPrLlbXdFr4eQaEzsMRCCxSbwqE6Xe8dQgpuIByqhKT6WDizrqFXnIufTunOMzU1gi aDQ3oKgyMdbaGE9XPElxGjq4x4VyTjuXqLfhxcek= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731308AbfDXOfM (ORCPT ); Wed, 24 Apr 2019 10:35:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:38980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731267AbfDXOfL (ORCPT ); Wed, 24 Apr 2019 10:35:11 -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 3646B21902; Wed, 24 Apr 2019 14:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556116510; bh=lm+4iFGynmvL/NpmlreNqT87c33oZ99Ef5IuOGAoM2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A5/WeVfiXDhCfMBjDHe/mhocReVP9I4g1w2zt3Prh6WjGAx/MaHYlUVcwXOatWSX8 JEQPKLCOUOTJXsx2bIHZa65V15FzZGmLgcb0e6VHHKQUzWGq8r7RoJtf9piytiTbWs XJXfQUy5s/yK7p0aynY07R4QM8QreIa3argH7b4w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shenghui Wang , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 36/66] block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx Date: Wed, 24 Apr 2019 10:33:10 -0400 Message-Id: <20190424143341.27665-36-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190424143341.27665-1-sashal@kernel.org> References: <20190424143341.27665-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: Shenghui Wang [ Upstream commit b9a1ff504b9492ad6beb7d5606e0e3365d4d8499 ] kfree() can leak the hctx->fq->flush_rq field. Reviewed-by: Ming Lei Signed-off-by: Shenghui Wang Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin (Microsoft) --- block/blk-mq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 16f9675c57e6..97eba6d23425 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2341,7 +2341,7 @@ static int blk_mq_init_hctx(struct request_queue *q, return 0; free_fq: - kfree(hctx->fq); + blk_free_flush_queue(hctx->fq); exit_hctx: if (set->ops->exit_hctx) set->ops->exit_hctx(hctx, hctx_idx); -- 2.19.1