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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 91C35CA9EBC for ; Sat, 26 Oct 2019 13:18:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5955F222C2 for ; Sat, 26 Oct 2019 13:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572095896; bh=CVo0oWZV+4414TStO0duI+OdPoiIoY8ztX3k3RdMuxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZehHZNVvae457jKEuIs8A4Ghw5MbLSmJ7JXIY/WC/1QuHMB6G0g2l64R/SKE6RFl3 /ZSBQb/CpMeuWQAT8R9fFu92UDkRPEHFr0+0hF67YXdStjWDnofmR7DySo0sQjoq5y uFtJcWXxHmUjVc5rvSzgUAwG1CasBhsw9Mishm+A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727744AbfJZNSP (ORCPT ); Sat, 26 Oct 2019 09:18:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:39864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726925AbfJZNSM (ORCPT ); Sat, 26 Oct 2019 09:18:12 -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 5B64721D81; Sat, 26 Oct 2019 13:18:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572095892; bh=CVo0oWZV+4414TStO0duI+OdPoiIoY8ztX3k3RdMuxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CWHdc92A9mZKGAnNtBVkNROoSZBfce56rKB9GABzXK90bH3XaHrOVL9R/nl5TUV4S tUNMAgiZ3dJ3hvZDpSPbxZOFz7U71XJJzXko61GgDRbuL7dC6jr/sVJZuJcyUyYhLe iH7FSUNMiIHbDonE+6b5C3uC+8WQGERsfcDuEUSY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Max Gurtovoy , Christoph Hellwig , Keith Busch , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.3 74/99] nvmet-loop: fix possible leakage during error flow Date: Sat, 26 Oct 2019 09:15:35 -0400 Message-Id: <20191026131600.2507-74-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191026131600.2507-1-sashal@kernel.org> References: <20191026131600.2507-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: Max Gurtovoy [ Upstream commit 5812d04c4c7455627d8722e04ab99a737cfe9713 ] During nvme_loop_queue_rq error flow, one must call nvme_cleanup_cmd since it's symmetric to nvme_setup_cmd. Signed-off-by: Max Gurtovoy Reviewed-by: Christoph Hellwig Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/target/loop.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index 0940c5024a345..7b857c3f67879 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -157,8 +157,10 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx, iod->sg_table.sgl = iod->first_sgl; if (sg_alloc_table_chained(&iod->sg_table, blk_rq_nr_phys_segments(req), - iod->sg_table.sgl, SG_CHUNK_SIZE)) + iod->sg_table.sgl, SG_CHUNK_SIZE)) { + nvme_cleanup_cmd(req); return BLK_STS_RESOURCE; + } iod->req.sg = iod->sg_table.sgl; iod->req.sg_cnt = blk_rq_map_sg(req->q, req, iod->sg_table.sgl); -- 2.20.1