Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp660311yba; Wed, 24 Apr 2019 07:36:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqwzhv31S1GpyySWjD1/p8m80JAYhl8ryk5DvQKqI5cTzdKEoFcmutRhnZI3ZtQr+tYaXczz X-Received: by 2002:a65:64d3:: with SMTP id t19mr31487451pgv.57.1556116614680; Wed, 24 Apr 2019 07:36:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556116614; cv=none; d=google.com; s=arc-20160816; b=UUyEJesdoEtx6odNERHeXKTphldbtJDzbQ0rs/Ba3wy4z3fM+SiAB4Rqe13tfL0i3g bD4rxfBAqnWhQ1wjrjkyMDgWsc6TJJl5MQSrQnIKgT93MRDaMwAHLo79o21UKtgNBxPW fLYXz4UqjqUphlw9OLNd1V5BAlWKtkinyMOyGLaNhFZb4z7U9fW0ADqUdT7Qwi0aRN/A +ZgGtQDSGrHwQG8Bcs2bHMZX3YfHNyAzp6lXFYC3zw/otuk7xjDNGrj/YkDNBYsR3wLZ cKKZyhVqnDXtV/GntDFx2ivqmlLjhVC7vlsRbCYnxWIiEawX0LKayXrAvihziWYI0yl2 hf/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EY6ByHfgbkrNoDIzuJkD2u4ZQEgjXOsRFg1qJ3tQq2E=; b=POi1gdKbwQt0lZmfKAwsnGhMKgA9eKA2qpxnlgaqVvpy3KOirZPRxSmGtAe5NAvOsN NrRCs70yyPJQKK07LXF5m58QYdeTM37eRNuiZ/SgRAbwO03xo0/TCiKTVi9JDZ/cVvgB 10B/ipUaKC7cTnOoJFQsP3VenO3YpbwhknB1k5HlXWdYPVJYHrlnMrS8m8u66l13JKKy u18EUr25lxa/2k6WyPLIR5ODKseIGi5Sc5VBc4nxWo3Apidl0zJYGQBkDw1LOPUKHgRB LKrITAZsbCFp64jxKz0VFLytccagUPVSKKHI6JSlg49H0ECOyOXMnHZURcL/kafgQ0O+ TDjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="A5/WeVfi"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w6si17627586pgr.71.2019.04.24.07.36.39; Wed, 24 Apr 2019 07:36:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="A5/WeVfi"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731317AbfDXOfN (ORCPT + 99 others); Wed, 24 Apr 2019 10:35:13 -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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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