Skip to contentSkip to conversation

nvme_fc: avoid double kfree(), don't call nvme_cleanup_cmd() in nvme_fc_unmap_data()

PATCH New Ewan D. Milne 4 participants 4 messages Apr 6, 2017 – Apr 9, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 nvme_fc: avoid double kfree(), don't call nvme_cleanup_cmd() in nvme_fc_unmap_data()

nvme_cleanup_cmd() is already called by callers of nvme_fc_unmap_data(). Don't call it twice to avoid double-free on completion of discard commands.

v2:
Move nvme_cleanup_cmd() call *after* nvme_fc_unmap_data() for consistency.

Signed-off-by Ewan D. Milne <emilne at redhat.com>
---
 drivers/nvme/host/fc.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/nvme/host/fc.c +1 -3
index fc42172..5ff8674 100644
@@ -1700,8 +1700,6 @@ enum blk_eh_timer_return
 				((rq_data_dir(rq) == WRITE) ?
 					DMA_TO_DEVICE : DMA_FROM_DEVICE));
 
-	nvme_cleanup_cmd(rq);
-
 	sg_free_table_chained(&freq->sg_table, true);
 
 	freq->sg_cnt = 0;
@@ -1929,8 +1927,8 @@ enum blk_eh_timer_return
 
 	state = atomic_xchg(&op->state, FCPOP_STATE_IDLE);
 
-	nvme_cleanup_cmd(rq);
 	nvme_fc_unmap_data(ctrl, rq, op);
+	nvme_cleanup_cmd(rq);
 	nvme_complete_rq(rq);
 	nvme_fc_ctrl_put(ctrl);
 
Signature · 1 line
1.7.1
#1 lore raw

PATCH v2 1/1 nvme_fc: avoid double kfree(), don't call nvme_cleanup_cmd() in nvme_fc_unmap_data()

Quoted 8 lines · Ewan Milne

nvme_cleanup_cmd() is already called by callers of nvme_fc_unmap_data(). Don't call it twice to avoid double-free on completion of discard commands.

v2:
Move nvme_cleanup_cmd() call *after* nvme_fc_unmap_data() for consistency.

Signed-off-by Ewan D. Milne <emilne at redhat.com>

---

Thanks,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                                          Storage
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Jane Smithard, Graham Norton
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850