drivers/video/kyro/* - compile warning cleanup
Subsystems (2)
PATCH 19/26 drivers/video/kyro/* - compile warning cleanup
Description: compile warning cleanup - handle copy_to/from_user error returns
Signed-off-by Stephen Biggs <[email protected]>
drivers/video/kyro/fbdev.c +21 -6
@@ -596,7 +596,10 @@ static int kyrofb_ioctl(struct inode *inswitch (cmd) {case KYRO_IOCTL_OVERLAY_CREATE : -copy_from_user (&ol_create, argp,sizeof (overlay_create)); +if (copy_from_user (&ol_create, argp,sizeof (overlay_create))) { +printk (KERN_ERR "copy_from_user failed!\n" ); +return -EFAULT ; + }if (kyro_dev_overlay_create (ol_create.ulWidth, ol_create.ulHeight,0 ) <0 ) {
@@ -606,8 +609,11 @@ static int kyrofb_ioctl(struct inode *in }break ;case KYRO_IOCTL_OVERLAY_VIEWPORT_SET : -copy_from_user (&ol_viewport_set, argp, -sizeof (overlay_viewport_set)); +if (copy_from_user (&ol_viewport_set, argp, +sizeof (overlay_viewport_set))) { +printk (KERN_ERR "copy_from_user failed!\n" ); +return -EFAULT ; + } if (kyro_dev_overlay_viewport_set(ol_viewport_set.xOrgin, ol_viewport_set.yOrgin,
@@ -627,13 +633,22 @@ static int kyrofb_ioctl(struct inode *in }break ;case KYRO_IOCTL_UVSTRIDE : -copy_to_user (argp, &deviceInfo.ulOverlayUVStride,sizeof (unsigned long )); +if (copy_to_user (argp, &deviceInfo.ulOverlayUVStride,sizeof (unsigned long ))) { +printk (KERN_ERR "copy_to_user failed!\n" ); +return -EFAULT ; + }break ;case KYRO_IOCTL_STRIDE : -copy_to_user (argp, &deviceInfo.ulOverlayStride,sizeof (unsigned long )); +if (copy_to_user (argp, &deviceInfo.ulOverlayStride,sizeof (unsigned long ))) { +printk (KERN_ERR "copy_to_user failed!\n" ); +return -EFAULT ; + }break ;case KYRO_IOCTL_OVERLAY_OFFSET : -copy_to_user (argp, &deviceInfo.ulOverlayOffset,sizeof (unsigned long )); +if (copy_to_user (argp, &deviceInfo.ulOverlayOffset,sizeof (unsigned long ))) { +printk (KERN_ERR "copy_to_user failed!\n" ); +return -EFAULT ; + }break ; }
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
drivers/video/kyro/fbdev.c static int kyrofb_ioctl(struct inode *in · line 600
Quoted 6 lines · Stephen Biggs
drivers/video/kyro/fbdev.c +2
-1-copy_from_user (&ol_create, argp,sizeof (overlay_create)); +if (copy_from_user (&ol_create, argp,sizeof (overlay_create))) { +printk (KERN_ERR "copy_from_user failed!\n" );
Forgotten "Kyro FB: " prefix.
Quoted 7 lines
drivers/video/kyro/fbdev.c +3
-3-copy_from_user (&ol_viewport_set, argp, -sizeof (overlay_viewport_set)); +if (copy_from_user (&ol_viewport_set, argp, +sizeof (overlay_viewport_set))) { +printk (KERN_ERR "copy_from_user failed!\n" ); -copy_to_user (argp, &deviceInfo.ulOverlayUVStride,sizeof (unsigned long ));
drivers/video/kyro/fbdev.c
Quoted 10 lines
drivers/video/kyro/fbdev.c +6
-2+if (copy_to_user (argp, &deviceInfo.ulOverlayUVStride,sizeof (unsigned long ))) { +printk (KERN_ERR "copy_to_user failed!\n" ); -copy_to_user (argp, &deviceInfo.ulOverlayStride,sizeof (unsigned long )); +if (copy_to_user (argp, &deviceInfo.ulOverlayStride,sizeof (unsigned long ))) { +printk (KERN_ERR "copy_to_user failed!\n" ); -copy_to_user (argp, &deviceInfo.ulOverlayOffset,sizeof (unsigned long )); +if (copy_to_user (argp, &deviceInfo.ulOverlayOffset,sizeof (unsigned long ))) { +printk (KERN_ERR "copy_to_user failed!\n" );
Alexey
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors