Commit 9b6fe313 authored May 20, 2009 by Michel Dänzer Committed by Jesse Barnes May 20, 2009

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: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

parent b6741377

drivers/gpu/drm/drm_drv.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;