Skip to contentSkip to conversation

updated-fbmem-patch.patch

PATCH Andrea Arcangeli 2 participants 3 messages Apr 21, 2004 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.5/2.6.5-mm4/broken-out/updated-fbmem-patch.patch

this uses get_user for the set_cmap operation too.

drivers/video/fbmem.c renamed from drivers/video/fbmem.c.~1~ +2 -2
@@ -1034,11 +1034,11 @@ fb_ioctl(struct inode *inode, struct fil
 	case FBIOPUTCMAP:
 		if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
 			return -EFAULT;
-		return (fb_set_cmap(&cmap, 0, info));
+		return (fb_set_cmap(&cmap, 1, info));
 	case FBIOGETCMAP:
 		if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
 			return -EFAULT;
-		return (fb_copy_cmap(&info->cmap, &cmap, 0));
+		return (fb_copy_cmap(&info->cmap, &cmap, 2));
 	case FBIOPAN_DISPLAY:
 		if (copy_from_user(&var, (void *) arg, sizeof(var)))
 			return -EFAULT;

this is the port to 2.4:

drivers/video/fbmem.c renamed from drivers/video/fbmem.c.~1~ +2 -2
@@ -511,11 +511,11 @@ fb_ioctl(struct inode *inode, struct fil
 	case FBIOPUTCMAP:
 		if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
 			return -EFAULT;
-		return (fb->fb_set_cmap(&cmap, 0, PROC_CONSOLE(info), info));
+		return (fb->fb_set_cmap(&cmap, 1, PROC_CONSOLE(info), info));
 	case FBIOGETCMAP:
 		if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
 			return -EFAULT;
-		return (fb->fb_get_cmap(&cmap, 0, PROC_CONSOLE(info), info));
+		return (fb->fb_get_cmap(&cmap, 1, PROC_CONSOLE(info), info));
 	case FBIOPAN_DISPLAY:
 		if (copy_from_user(&var, (void *) arg, sizeof(var)))
 			return -EFAULT;

(1 not a typo)

Let me know if you see something wrong, it's untested.

#1 lore raw

drivers/video/fbmem.c fb_ioctl(struct inode *inode, struct fil · line 1037

Quoted 12 lines · * Andrea Arcangeli ([email protected]) wrote:

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.5/2.6.5-mm4/broken-out/updated-fbmem-patch.patch

this uses get_user for the set_cmap operation too.

drivers/video/fbmem.c renamed from drivers/video/fbmem.c.~1~ +1 -1
@@ -1034,11 +1034,11 @@ fb_ioctl(struct inode *inode, struct fil
 	case FBIOPUTCMAP:
 		if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
 			return -EFAULT;
-		return (fb_set_cmap(&cmap, 0, info));
+		return (fb_set_cmap(&cmap, 1, info));

0 is userspace, 1 is kernel space. this change looks wrong.

Perhaps the change below so comment is in sync with code.

drivers/video/fbcmap.c +1 -1
@@ -207,7 +207,7 @@
 /**
  *	fb_set_cmap - set the colormap
  *	@cmap: frame buffer colormap structure
- *	@kspc: boolean, 0 copy local, 1 get_user() function
+ *	@kspc: boolean, 0 get_user() function , 1 copy local
  *	@info: frame buffer info structure
  *
  *	Sets the colormap @cmap for a screen of device @info.
#2 lore raw
Quoted 16 lines · Chris Wright

drivers/video/fbmem.c fb_ioctl(struct inode *inode, struct fil · line 1037

Quoted 12 lines · * Andrea Arcangeli ([email protected]) wrote:

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.5/2.6.5-mm4/broken-out/updated-fbmem-patch.patch

this uses get_user for the set_cmap operation too.

drivers/video/fbmem.c renamed from drivers/video/fbmem.c.~1~ +1 -1
@@ -1034,11 +1034,11 @@ fb_ioctl(struct inode *inode, struct fil
 	case FBIOPUTCMAP:
 		if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
 			return -EFAULT;
-		return (fb_set_cmap(&cmap, 0, info));
+		return (fb_set_cmap(&cmap, 1, info));

0 is userspace, 1 is kernel space. this change looks wrong.

Quoted 1 line

Perhaps the change below so comment is in sync with code.

yes, I was mislead by the comment, that's why you will never ever see a single comments describing parameters in my code (except if the stuff really isn't obvious and it cannot be trivially deduced by the code and in turn it _deserves_ a fat comment, definitely not in this case). There's no way I can trust comments anyways, I perfectly know I cannot stop after reading a comment, I went ahead and I checked if the comment was right but it was too late and I was already biased by what I read in the comment so I didn't notice the comment was wrong. This isn't a good excuse, it's still my bad mistake, shame on me, but it certainly gives more strenght to my no-comment-for-obvious-parameters policy. I don't care if you cannot do a pdf of the whole kernel anymore, that pdf is likely buggy anyways and you'd better not attempt to read it in the first place.

Arjan and Andrew also notified me privately. thanks to all for noticing and sorry for the stupid mistake of being influenced by a worthless comment.