patch-2.4.0-test8 linux/drivers/video/matrox/matroxfb_crtc2.c

• Lines: 40
• Date: Tue Aug 29 14:09:15 2000
• Orig file: v2.4.0-test7/linux/drivers/video/matrox/matroxfb_crtc2.c
• Orig date: Mon Jul 10 16:47:25 2000

diff -u --recursive --new-file v2.4.0-test7/linux/drivers/video/matrox/matroxfb_crtc2.c linux/drivers/video/matrox/matroxfb_crtc2.c
@@ -509,7 +509,8 @@
 				err = matroxfb_dh_get_vblank(m2info, &vblank);
 				if (err)
 					return err;
-				copy_to_user_ret((struct fb_vblank*)arg, &vblank, sizeof(vblank), -EFAULT);
+				if (copy_to_user((struct fb_vblank*)arg, &vblank, sizeof(vblank)))
+					return -EFAULT;
 				return 0;
 			}
 		case MATROXFB_SET_OUTPUT_MODE:
@@ -522,7 +523,8 @@
 			{
 				u_int32_t tmp;
 
-				get_user_ret(tmp, (u_int32_t*)arg, -EFAULT);
+				if (get_user(tmp, (u_int32_t*)arg))
+					return -EFAULT;
 				if (tmp & ~ACCESS_FBINFO(output.all))
 					return -EINVAL;
 				if (tmp & ACCESS_FBINFO(output.ph))
@@ -539,7 +541,8 @@
 			}
 		case MATROXFB_GET_OUTPUT_CONNECTION:
 			{
-				put_user_ret(ACCESS_FBINFO(output.sh), (u_int32_t*)arg, -EFAULT);
+				if (put_user(ACCESS_FBINFO(output.sh), (u_int32_t*)arg))
+					return -EFAULT;
 				return 0;
 			}
 		case MATROXFB_GET_AVAILABLE_OUTPUTS:
@@ -551,7 +554,8 @@
 				/* CRTC1 in DFP mode disables CRTC2 at all (I know, I'm lazy) */
 				if (ACCESS_FBINFO(output.ph) & MATROXFB_OUTPUT_CONN_DFP)
 					tmp = 0;
-				put_user_ret(tmp, (u_int32_t*)arg, -EFAULT);
+				if (put_user(tmp, (u_int32_t*)arg))
+					return -EFAULT;
 				return 0;
 			}
 	}