From: Chayan Biswas Date: Wed, 22 May 2013 22:34:49 +0000 (+0000) Subject: Return the result from user admin command IOCTL even in case of failure X-Git-Tag: upstream/snapshot3+hdmi~4943^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf90bc4830b858487fe4b9b9ecd0031e23ca3e83;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Return the result from user admin command IOCTL even in case of failure We copy the result to user if the command is completed from the controller even if it completes with failure (non-zero) status. A return status of < 0 indicates the command was not completed by the controller. The user application may expect the error code in the result field in case of failure. Signed-off-by: Chayan Biswas Signed-off-by: Matthew Wilcox --- diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 42abf72..8493708 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1439,7 +1439,7 @@ static int nvme_user_admin_cmd(struct nvme_dev *dev, nvme_free_iod(dev, iod); } - if (!status && copy_to_user(&ucmd->result, &cmd.result, + if ((status >= 0) && copy_to_user(&ucmd->result, &cmd.result, sizeof(cmd.result))) status = -EFAULT;