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=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,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 AA9A8C04A6B for ; Mon, 6 May 2019 15:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 734E82053B for ; Mon, 6 May 2019 15:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557154910; bh=ngwj5a2qD/QNwjivqdPgXmVKw5Q0d0X280koxUtLsf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f6gtQgH/BAxmUFio5TFduhx90IMwEoPbt0hLNQRDojQCPmvOhuEYLIg3sWzkqluhs UYcvjcBArHIkLKTug9jonERaiYFkB+Dq5Xgrk125+VHRa+2kJmRRUBk2VZpjVAkvzo D3sarSGtnX6BEAYCc1vvgdVXZuXBpDLOp+rVFcds= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727661AbfEFOk7 (ORCPT ); Mon, 6 May 2019 10:40:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:34614 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728114AbfEFOk5 (ORCPT ); Mon, 6 May 2019 10:40:57 -0400 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 19E72214AE; Mon, 6 May 2019 14:40:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153656; bh=ngwj5a2qD/QNwjivqdPgXmVKw5Q0d0X280koxUtLsf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iwL1wZ2SdoE2qUWvmLZRhcPY0qwHF0bZdXcggEtmcKs2iq7BzxWdhPlvhfFnMSRBV iSvszv4kPmxO+22afnVGZEzfzXV72uHO0+pwr9bYRXf6tWOUU3Eq9dwkORm9ZkKrZq 8Pd3oVQaLpVXdVH8Da9b+dlDRJp15LtoN5sRJdQI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ming Lei , Shenghui Wang , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 47/99] block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx Date: Mon, 6 May 2019 16:32:20 +0200 Message-Id: <20190506143058.336095707@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143053.899356316@linuxfoundation.org> References: <20190506143053.899356316@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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 --- 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 7d53f2314d7c..414656796ecf 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2236,7 +2236,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.20.1