Fix IOCTL calls returning the wrong value
In some cases, the IOCTL functions didn't update the return value
variable so the wrong value was returned from the IOCTL calls.
Change-Id: I56529f8fb03cec52dbc555d5ed3d4e68e4bfab70
Signed-off-by: Mikael Olsson <mikael.olsson@arm.com>
diff --git a/kernel/ethosu_network.c b/kernel/ethosu_network.c
index 52f6144..6dc0ce4 100644
--- a/kernel/ethosu_network.c
+++ b/kernel/ethosu_network.c
@@ -99,7 +99,7 @@
struct ethosu_network *net = file->private_data;
struct device *dev = net->dev;
void __user *udata = (void __user *)arg;
- int ret = -EINVAL;
+ int ret;
ret = device_lock_interruptible(net->dev);
if (ret)
@@ -113,8 +113,10 @@
case ETHOSU_IOCTL_NETWORK_INFO: {
struct ethosu_uapi_network_info uapi;
- if (copy_from_user(&uapi, udata, sizeof(uapi)))
+ if (copy_from_user(&uapi, udata, sizeof(uapi))) {
+ ret = -EFAULT;
break;
+ }
dev_info(dev,
"Network ioctl: Network info. net=0x%pK\n",
@@ -132,8 +134,10 @@
case ETHOSU_IOCTL_INFERENCE_CREATE: {
struct ethosu_uapi_inference_create uapi;
- if (copy_from_user(&uapi, udata, sizeof(uapi)))
+ if (copy_from_user(&uapi, udata, sizeof(uapi))) {
+ ret = -EFAULT;
break;
+ }
dev_info(dev,
"Network ioctl: Inference. ifm_fd=%u, ofm_fd=%u\n",
@@ -145,6 +149,7 @@
default: {
dev_err(dev, "Invalid ioctl. cmd=%u, arg=%lu",
cmd, arg);
+ ret = -ENOIOCTLCMD;
break;
}
}