Pull fbdev fix from Bartlomiej Zolnierkiewicz: "Just a single fix to close a kernel data leak in FBIOGETCMAP_SPARC ioctl" * tag 'fbdev-v4.16-rc5' of git://github.com/bzolnier/linux: fbdev: Fixing arbitrary kernel leak in case FBIOGETCMAP_SPARC in sbusfb_ioctl_helper().
Unified · Split
| @@ -122,7 +122,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, · 121 unmodified lines | |||
| 122 | unsigned char __user *ured; | 122 | unsigned char __user *ured; |
| 123 | unsigned char __user *ugreen; | 123 | unsigned char __user *ugreen; |
| 124 | unsigned char __user *ublue; | 124 | unsigned char __user *ublue; |
| 125 | int index, count, i; | 125 | unsigned int index, count, i; |
| 126 | 126 | ||
| 127 | if (get_user(index, &c->index) || | 127 | if (get_user(index, &c->index) || |
| 128 | __get_user(count, &c->count) || | 128 | __get_user(count, &c->count) || |
| @@ -161,7 +161,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, · 32 unmodified lines | |||
| 161 | unsigned char __user *ugreen; | 161 | unsigned char __user *ugreen; |
| 162 | unsigned char __user *ublue; | 162 | unsigned char __user *ublue; |
| 163 | struct fb_cmap *cmap = &info->cmap; | 163 | struct fb_cmap *cmap = &info->cmap; |
| 164 | int index, count, i; | 164 | unsigned int index, count, i; |
| 165 | u8 red, green, blue; | 165 | u8 red, green, blue; |
| 166 | 166 | ||
| 167 | if (get_user(index, &c->index) || | 167 | if (get_user(index, &c->index) || |