Commit 9b6fe313 authored by Michel Dänzer's avatar Michel Dänzer Committed by Jesse Barnes

drm: Copy back ioctl data to userspace regardless of return code.

Fixes a regression from commit 9d5b3ffc
('drm: fixup some of the ioctl function exit paths'): The vblank ioctl
needs to update the userspace parameters when interrupted by a signal,
which was prevented by the return code check. This could cause the X
server to hang in drmWaitVBlank().
Signed-off-by: default avatarMichel Dänzer <daenzer@vmware.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent b6741377
...@@ -481,7 +481,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, ...@@ -481,7 +481,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
} }
retcode = func(dev, kdata, file_priv); retcode = func(dev, kdata, file_priv);
if ((retcode == 0) && (cmd & IOC_OUT)) { if (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 = -EFAULT; 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