From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@infradead.org>,
linux-block <linux-block@vger.kernel.org>,
Damien Le Moal <Damien.LeMoal@wdc.com>,
Keith Busch <kbusch@kernel.org>,
"linux-scsi @ vger . kernel . org" <linux-scsi@vger.kernel.org>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
"linux-fsdevel @ vger . kernel . org"
<linux-fsdevel@vger.kernel.org>,
Johannes Thumshirn <johannes.thumshirn@wdc.com>,
Christoph Hellwig <hch@lst.de>, Daniel Wagner <dwagner@suse.de>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH v9 01/11] scsi: free sgtables in case command setup fails
Date: Tue, 28 Apr 2020 19:45:55 +0900 [thread overview]
Message-ID: <20200428104605.8143-2-johannes.thumshirn@wdc.com> (raw)
In-Reply-To: <20200428104605.8143-1-johannes.thumshirn@wdc.com>
In case scsi_setup_fs_cmnd() fails we're not freeing the sgtables
allocated by scsi_init_io(), thus we leak the allocated memory.
So free the sgtables allocated by scsi_init_io() in case
scsi_setup_fs_cmnd() fails.
Technically scsi_setup_scsi_cmnd() does not suffer from this problem, as
it can only fail if scsi_init_io() fails, so it does not have sgtables
allocated. But to maintain symmetry and as a measure of defensive
programming, free the sgtables on scsi_setup_scsi_cmnd() failure as well.
scsi_mq_free_sgtables() has safeguards against double-freeing of memory so
this is safe to do.
While we're at it, rename scsi_mq_free_sgtables() to scsi_free_sgtables().
Link: https://bugzilla.kernel.org/show_bug.cgi?id=205595
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/scsi_lib.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 0a73230a8f16..f0cb26b3da6a 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -548,7 +548,7 @@ static void scsi_uninit_cmd(struct scsi_cmnd *cmd)
}
}
-static void scsi_mq_free_sgtables(struct scsi_cmnd *cmd)
+static void scsi_free_sgtables(struct scsi_cmnd *cmd)
{
if (cmd->sdb.table.nents)
sg_free_table_chained(&cmd->sdb.table,
@@ -560,7 +560,7 @@ static void scsi_mq_free_sgtables(struct scsi_cmnd *cmd)
static void scsi_mq_uninit_cmd(struct scsi_cmnd *cmd)
{
- scsi_mq_free_sgtables(cmd);
+ scsi_free_sgtables(cmd);
scsi_uninit_cmd(cmd);
}
@@ -1086,7 +1086,7 @@ blk_status_t scsi_init_io(struct scsi_cmnd *cmd)
return BLK_STS_OK;
out_free_sgtables:
- scsi_mq_free_sgtables(cmd);
+ scsi_free_sgtables(cmd);
return ret;
}
EXPORT_SYMBOL(scsi_init_io);
@@ -1217,6 +1217,7 @@ static blk_status_t scsi_setup_cmnd(struct scsi_device *sdev,
struct request *req)
{
struct scsi_cmnd *cmd = blk_mq_rq_to_pdu(req);
+ blk_status_t ret;
if (!blk_rq_bytes(req))
cmd->sc_data_direction = DMA_NONE;
@@ -1226,9 +1227,14 @@ static blk_status_t scsi_setup_cmnd(struct scsi_device *sdev,
cmd->sc_data_direction = DMA_FROM_DEVICE;
if (blk_rq_is_scsi(req))
- return scsi_setup_scsi_cmnd(sdev, req);
+ ret = scsi_setup_scsi_cmnd(sdev, req);
else
- return scsi_setup_fs_cmnd(sdev, req);
+ ret = scsi_setup_fs_cmnd(sdev, req);
+
+ if (ret != BLK_STS_OK)
+ scsi_free_sgtables(cmd);
+
+ return ret;
}
static blk_status_t
--
2.24.1
next prev parent reply other threads:[~2020-04-28 10:46 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 10:45 [PATCH v9 00/11] Introduce Zone Append for writing to zoned block devices Johannes Thumshirn
2020-04-28 10:45 ` Johannes Thumshirn [this message]
2020-04-29 12:48 ` [PATCH v9 01/11] scsi: free sgtables in case command setup fails Johannes Thumshirn
2020-04-28 10:45 ` [PATCH v9 02/11] block: provide fallbacks for blk_queue_zone_is_seq and blk_queue_zone_no Johannes Thumshirn
2020-05-06 2:51 ` Martin K. Petersen
2020-04-28 10:45 ` [PATCH v9 03/11] block: rename __bio_add_pc_page to bio_add_hw_page Johannes Thumshirn
2020-05-06 2:52 ` Martin K. Petersen
2020-04-28 10:45 ` [PATCH v9 04/11] block: Introduce REQ_OP_ZONE_APPEND Johannes Thumshirn
2020-05-06 2:56 ` Martin K. Petersen
2020-04-28 10:45 ` [PATCH v9 05/11] block: introduce blk_req_zone_write_trylock Johannes Thumshirn
2020-05-06 2:57 ` Martin K. Petersen
2020-04-28 10:46 ` [PATCH v9 06/11] block: Modify revalidate zones Johannes Thumshirn
2020-05-06 2:57 ` Martin K. Petersen
2020-04-28 10:46 ` [PATCH v9 07/11] scsi: sd_zbc: factor out sanity checks for zoned commands Johannes Thumshirn
2020-05-06 2:58 ` Martin K. Petersen
2020-04-28 10:46 ` [PATCH v9 08/11] scsi: sd_zbc: emulate ZONE_APPEND commands Johannes Thumshirn
2020-04-28 11:42 ` Hannes Reinecke
2020-04-28 12:09 ` Johannes Thumshirn
2020-04-28 14:50 ` Douglas Gilbert
2020-05-06 3:21 ` Martin K. Petersen
2020-04-28 10:46 ` [PATCH v9 09/11] null_blk: Support REQ_OP_ZONE_APPEND Johannes Thumshirn
2020-04-28 11:43 ` Hannes Reinecke
2020-05-06 3:22 ` Martin K. Petersen
2020-04-28 10:46 ` [PATCH v9 10/11] block: export bio_release_pages and bio_iov_iter_get_pages Johannes Thumshirn
2020-04-28 11:43 ` Hannes Reinecke
2020-05-06 3:23 ` Martin K. Petersen
2020-04-28 10:46 ` [PATCH v9 11/11] zonefs: use REQ_OP_ZONE_APPEND for sync DIO Johannes Thumshirn
2020-04-30 2:18 ` [PATCH v9 00/11] Introduce Zone Append for writing to zoned block devices Martin K. Petersen
2020-05-05 19:01 ` Johannes Thumshirn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200428104605.8143-2-johannes.thumshirn@wdc.com \
--to=johannes.thumshirn@wdc.com \
--cc=Damien.LeMoal@wdc.com \
--cc=axboe@kernel.dk \
--cc=dwagner@suse.de \
--cc=hare@suse.de \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).