Commit b0d61d58 authored by Keith Busch's avatar Keith Busch Committed by Christoph Hellwig
Browse files

nvme: Fix NULL dereference on reservation request 



This fixes using the NULL 'head' before getting the reference. It is
however possible the head will always be NULL, so this patch uses the
struct nvme_ns to get the ns_id field.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 89c4aff6

drivers/nvme/host/core.c

+6 −6
Original line number Diff line number Diff line
@@ -1449,18 +1449,18 @@ static int nvme_pr_command(struct block_device *bdev, u32 cdw10, 
	int srcu_idx, ret;

	u8 data[16] = { 0, };



	ns = nvme_get_ns_from_disk(bdev->bd_disk, &head, &srcu_idx);

	if (unlikely(!ns))

		return -EWOULDBLOCK;



	put_unaligned_le64(key, &data[0]);

	put_unaligned_le64(sa_key, &data[8]);



	memset(&c, 0, sizeof(c));

	c.common.opcode = op;

	c.common.nsid = cpu_to_le32(head->ns_id);

	c.common.nsid = cpu_to_le32(ns->head->ns_id);

	c.common.cdw10[0] = cpu_to_le32(cdw10);



	ns = nvme_get_ns_from_disk(bdev->bd_disk, &head, &srcu_idx);

	if (unlikely(!ns))

		ret = -EWOULDBLOCK;

	else

	ret = nvme_submit_sync_cmd(ns->queue, &c, data, 16);

	nvme_put_ns_from_disk(head, srcu_idx);

	return ret;