Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a951946a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fbdev: Fixing arbitrary kernel leak in case FBIOGETCMAP_SPARC in sbusfb_ioctl_helper()."

parents 0b8db12b cf40600a

drivers/video/fbdev/sbuslib.c

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, 
		unsigned char __user *ured;

		unsigned char __user *ugreen;

		unsigned char __user *ublue;

		int index, count, i;

		unsigned int index, count, i;



		if (get_user(index, &c->index) ||

		    __get_user(count, &c->count) ||
@@ -160,7 +160,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, 
		unsigned char __user *ugreen;

		unsigned char __user *ublue;

		struct fb_cmap *cmap = &info->cmap;

		int index, count, i;

		unsigned int index, count, i;

		u8 red, green, blue;



		if (get_user(index, &c->index) ||