Commit 9d5b3ffc authored by Dave Airlie's avatar Dave Airlie

drm: fixup some of the ioctl function exit paths

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 19a8f59a
...@@ -495,23 +495,25 @@ int drm_ioctl(struct inode *inode, struct file *filp, ...@@ -495,23 +495,25 @@ int drm_ioctl(struct inode *inode, struct file *filp,
} else { } else {
if (cmd & (IOC_IN | IOC_OUT)) { if (cmd & (IOC_IN | IOC_OUT)) {
kdata = kmalloc(_IOC_SIZE(cmd), GFP_KERNEL); kdata = kmalloc(_IOC_SIZE(cmd), GFP_KERNEL);
if (!kdata) if (!kdata) {
return -ENOMEM; retcode = -ENOMEM;
goto err_i1;
}
} }
if (cmd & IOC_IN) { if (cmd & IOC_IN) {
if (copy_from_user(kdata, (void __user *)arg, if (copy_from_user(kdata, (void __user *)arg,
_IOC_SIZE(cmd)) != 0) { _IOC_SIZE(cmd)) != 0) {
retcode = -EACCES; retcode = -EFAULT;
goto err_i1; goto err_i1;
} }
} }
retcode = func(dev, kdata, file_priv); retcode = func(dev, kdata, file_priv);
if (cmd & IOC_OUT) { if ((retcode == 0) && (cmd & IOC_OUT)) {
if (copy_to_user((void __user *)arg, kdata, if (copy_to_user((void __user *)arg, kdata,
_IOC_SIZE(cmd)) != 0) _IOC_SIZE(cmd)) != 0)
retcode = -EACCES; retcode = -EFAULT;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment