Commit e5d574ab authored by Chunguang Xu's avatar Chunguang Xu Committed by Keith Busch
Browse files

nvme: avoid double free special payload 



If a discard request needs to be retried, and that retry may fail before
a new special payload is added, a double free will result. Clear the
RQF_SPECIAL_LOAD when the request is cleaned.

Signed-off-by: default avatarChunguang Xu <chunguang.xu@shopee.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent b1a1fdd7

drivers/nvme/host/core.c

+1 −0
Original line number Diff line number Diff line
@@ -998,6 +998,7 @@ void nvme_cleanup_cmd(struct request *req) 
			clear_bit_unlock(0, &ctrl->discard_page_busy);

		else

			kfree(bvec_virt(&req->special_vec));

		req->rq_flags &= ~RQF_SPECIAL_PAYLOAD;

	}

}

EXPORT_SYMBOL_GPL(nvme_cleanup_cmd);