From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Date: Wed, 07 Oct 2020 07:44:46 +0000 Subject: [PATCH 2/3] fbdev/sbuslib: refactor sbusfb_ioctl_helper Message-Id: <20201007074447.797968-3-hch@lst.de> List-Id: References: <20201007074447.797968-1-hch@lst.de> In-Reply-To: <20201007074447.797968-1-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Geert Uytterhoeven , "David S. Miller" , Bartlomiej Zolnierkiewicz Cc: Arnd Bergmann , linux-m68k@lists.linux-m68k.org, sparclinux@vger.kernel.org, linux-fbdev@vger.kernel.org Refactor sbusfb_ioctl_helper into a bunch of self-contained helpers, to prepare for improvements to the compat ioctl handler. Signed-off-by: Christoph Hellwig --- drivers/video/fbdev/sbuslib.c | 157 ++++++++++++++++------------------ 1 file changed, 75 insertions(+), 82 deletions(-) diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c index 176dbfb5d3efca..1c3bf1cb8dccd7 100644 --- a/drivers/video/fbdev/sbuslib.c +++ b/drivers/video/fbdev/sbuslib.c @@ -97,94 +97,87 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map, } EXPORT_SYMBOL(sbusfb_mmap_helper); -int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, - struct fb_info *info, - int type, int fb_depth, unsigned long fb_size) +static int sbufsfb_ioctl_gtype(struct fbtype __user *f, struct fb_info *info, + int type, int fb_depth, unsigned long fb_size) { - switch(cmd) { - case FBIOGTYPE: { - struct fbtype __user *f = (struct fbtype __user *) arg; - - if (put_user(type, &f->fb_type) || - put_user(info->var.yres, &f->fb_height) || - put_user(info->var.xres, &f->fb_width) || - put_user(fb_depth, &f->fb_depth) || - put_user(0, &f->fb_cmsize) || - put_user(fb_size, &f->fb_cmsize)) - return -EFAULT; - return 0; - } - case FBIOPUTCMAP_SPARC: { - struct fbcmap __user *c = (struct fbcmap __user *) arg; - struct fb_cmap cmap; - u16 red, green, blue; - u8 red8, green8, blue8; - unsigned char __user *ured; - unsigned char __user *ugreen; - unsigned char __user *ublue; - unsigned int index, count, i; - - if (get_user(index, &c->index) || - get_user(count, &c->count) || - get_user(ured, &c->red) || - get_user(ugreen, &c->green) || - get_user(ublue, &c->blue)) + if (put_user(type, &f->fb_type) || + put_user(info->var.yres, &f->fb_height) || + put_user(info->var.xres, &f->fb_width) || + put_user(fb_depth, &f->fb_depth) || + put_user(fb_size, &f->fb_cmsize)) + return -EFAULT; + return 0; +} + +static int sbusfb_ioctl_putcmap(struct fbcmap *c, struct fb_info *info) +{ + u8 red8, green8, blue8; + u16 red, green, blue; + struct fb_cmap cmap; + unsigned int i; + int err; + + cmap.len = 1; + cmap.red = &red; + cmap.green = &green; + cmap.blue = &blue; + cmap.transp = NULL; + for (i = 0; i < c->count; i++) { + if (get_user(red8, c->red + i) || + get_user(green8, c->green + i) || + get_user(blue8, c->blue + i)) return -EFAULT; - cmap.len = 1; - cmap.red = &red; - cmap.green = &green; - cmap.blue = &blue; - cmap.transp = NULL; - for (i = 0; i < count; i++) { - int err; - - if (get_user(red8, &ured[i]) || - get_user(green8, &ugreen[i]) || - get_user(blue8, &ublue[i])) - return -EFAULT; - - red = red8 << 8; - green = green8 << 8; - blue = blue8 << 8; - - cmap.start = index + i; - err = fb_set_cmap(&cmap, info); - if (err) - return err; - } - return 0; + red = red8 << 8; + green = green8 << 8; + blue = blue8 << 8; + + cmap.start = c->index + i; + err = fb_set_cmap(&cmap, info); + if (err) + return err; } - case FBIOGETCMAP_SPARC: { - struct fbcmap __user *c = (struct fbcmap __user *) arg; - unsigned char __user *ured; - unsigned char __user *ugreen; - unsigned char __user *ublue; - struct fb_cmap *cmap = &info->cmap; - unsigned int index, count, i; - u8 red, green, blue; - - if (get_user(index, &c->index) || - get_user(count, &c->count) || - get_user(ured, &c->red) || - get_user(ugreen, &c->green) || - get_user(ublue, &c->blue)) - return -EFAULT; + return 0; +} - if (index > cmap->len || count > cmap->len - index) - return -EINVAL; - - for (i = 0; i < count; i++) { - red = cmap->red[index + i] >> 8; - green = cmap->green[index + i] >> 8; - blue = cmap->blue[index + i] >> 8; - if (put_user(red, &ured[i]) || - put_user(green, &ugreen[i]) || - put_user(blue, &ublue[i])) - return -EFAULT; - } - return 0; +static int sbusfb_ioctl_getcmap(struct fbcmap *c, struct fb_info *info) +{ + unsigned int i; + + if (c->index > info->cmap.len || c->count > info->cmap.len - c->index) + return -EINVAL; + + for (i = 0; i < c->count; i++) { + u8 red = info->cmap.red[c->index + i] >> 8; + u8 green = info->cmap.green[c->index + i] >> 8; + u8 blue = info->cmap.blue[c->index + i] >> 8; + + if (put_user(red, c->red + i) || + put_user(green, c->green + i) || + put_user(blue, c->blue + i)) + return -EFAULT; } + return 0; +} + +int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, + struct fb_info *info, + int type, int fb_depth, unsigned long fb_size) +{ + void __user *argp = (void __user *)arg; + struct fbcmap kc; + + switch (cmd) { + case FBIOGTYPE: + return sbufsfb_ioctl_gtype(argp, info, type, fb_depth, fb_size); + case FBIOPUTCMAP_SPARC: + if (copy_from_user(&kc, argp, sizeof(kc))) + return -EFAULT; + return sbusfb_ioctl_putcmap(&kc, info); + case FBIOGETCMAP_SPARC: + if (copy_from_user(&kc, argp, sizeof(kc))) + return -EFAULT; + return sbusfb_ioctl_getcmap(&kc, info); default: return -EINVAL; } -- 2.28.0