lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm: fixup some of the ioctl function exit paths

Browse Source 
Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
Dave Airlie
2008-02-07 14:51:32 +10:00
parent 19a8f59ab8
commit 9d5b3ffc42
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/char/drm/drm_drv.c
View File

@@ -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;
} }
} }