Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4f117f6 authored by Keith Busch's avatar Keith Busch Committed by Matthew Wilcox
Browse files

NVMe: Set result from user admin command 



The ioctl data structure includes space for the 'result' of the admin
command to be returned; it just wasn't filled in.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent 3295874b

drivers/block/nvme.c

+6 −1
Original line number Diff line number Diff line
@@ -1237,12 +1237,17 @@ static int nvme_user_admin_cmd(struct nvme_dev *dev, 
	if (length != cmd.data_len)

		status = -ENOMEM;

	else

		status = nvme_submit_admin_cmd(dev, &c, NULL);

		status = nvme_submit_admin_cmd(dev, &c, &cmd.result);



	if (cmd.data_len) {

		nvme_unmap_user_pages(dev, cmd.opcode & 1, iod);

		nvme_free_iod(dev, iod);

	}



	if (!status && copy_to_user(&ucmd->result, &cmd.result,

							sizeof(cmd.result)))

		status = -EFAULT;



	return status;

}