aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/nvme.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index af88635e44e4..47c860454289 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -1237,12 +1237,17 @@ static int nvme_user_admin_cmd(struct nvme_dev *dev,
1237 if (length != cmd.data_len) 1237 if (length != cmd.data_len)
1238 status = -ENOMEM; 1238 status = -ENOMEM;
1239 else 1239 else
1240 status = nvme_submit_admin_cmd(dev, &c, NULL); 1240 status = nvme_submit_admin_cmd(dev, &c, &cmd.result);
1241 1241
1242 if (cmd.data_len) { 1242 if (cmd.data_len) {
1243 nvme_unmap_user_pages(dev, cmd.opcode & 1, iod); 1243 nvme_unmap_user_pages(dev, cmd.opcode & 1, iod);
1244 nvme_free_iod(dev, iod); 1244 nvme_free_iod(dev, iod);
1245 } 1245 }
1246
1247 if (!status && copy_to_user(&ucmd->result, &cmd.result,
1248 sizeof(cmd.result)))
1249 status = -EFAULT;
1250
1246 return status; 1251 return status;
1247} 1252}
1248 1253