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=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 8AA95C433E0 for ; Mon, 29 Mar 2021 22:29:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BB5E61879 for ; Mon, 29 Mar 2021 22:29:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232984AbhC2W2k (ORCPT ); Mon, 29 Mar 2021 18:28:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:47158 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232327AbhC2WXw (ORCPT ); Mon, 29 Mar 2021 18:23:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9BCDF619C9; Mon, 29 Mar 2021 22:23:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1617056601; bh=BoPHnF4INBVRt/wnBStzPDj5QfKJc8mf7l/Du07L0rk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G2ebP0ffFtGh7Y/BZiZrjSWePF1WJYumZgzPq+byys2qwOmiPp7TK58cJ6e+2c7NF l4do8hHYYYC5cejU2fqTYcy/Gyvh1kG22SmxoSa0rs6l5+ZuHrRDaKw/W7JYkPlF+k g1sYgwpQPZI3mQFDNviVFtpEpIVKB+EU2PnHQa4lmnZ/rajC6t+rRJ0ilc9Zc2mbbV ipq7yDAxhrNU90AlDx2SYKq+gqzFLWzSsYvTa5Nrs7Wz+fxMQpYU6c8lyJTcvD7MaA zSJGuMISdFmWhJOOD2bOqZBtEqLFaWlQpiMJ+TtcEMIGQnRfN4fZ49515oSKxtRlnz YUjD9pH18ks1Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Wilck , Christoph Hellwig , Lee Duncan , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 15/19] scsi: target: pscsi: Clean up after failure in pscsi_map_sg() Date: Mon, 29 Mar 2021 18:22:58 -0400 Message-Id: <20210329222303.2383319-15-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210329222303.2383319-1-sashal@kernel.org> References: <20210329222303.2383319-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Wilck [ Upstream commit 36fa766faa0c822c860e636fe82b1affcd022974 ] If pscsi_map_sg() fails, make sure to drop references to already allocated bios. Link: https://lore.kernel.org/r/20210323212431.15306-2-mwilck@suse.com Reviewed-by: Christoph Hellwig Reviewed-by: Lee Duncan Signed-off-by: Martin Wilck Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/target/target_core_pscsi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c index c9d92b3e777d..5a047ce77bc0 100644 --- a/drivers/target/target_core_pscsi.c +++ b/drivers/target/target_core_pscsi.c @@ -939,6 +939,14 @@ pscsi_map_sg(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, return 0; fail: + if (bio) + bio_put(bio); + while (req->bio) { + bio = req->bio; + req->bio = bio->bi_next; + bio_put(bio); + } + req->biotail = NULL; return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE; } -- 2.30.1