From patchwork Wed Oct 7 07:44:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 293236 From: Christoph Hellwig Date: Wed, 07 Oct 2020 07:44:45 +0000 Subject: [PATCH 1/3] fbdev/sbuslib: remove FBIOSCURSOR/FBIOGCURSOR leftovers Message-Id: <20201007074447.797968-2-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 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 There are no actual implementations of FBIOSCURSOR/FBIOGCURSOR left, so don't bother with a compat handler for it, and remove the remaining definitions as well. Signed-off-by: Christoph Hellwig Acked-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- arch/m68k/include/asm/fbio.h | 29 ----------------------------- arch/sparc/include/asm/fbio.h | 13 ------------- arch/sparc/include/uapi/asm/fbio.h | 15 --------------- drivers/video/fbdev/sbuslib.c | 30 ------------------------------ 4 files changed, 87 deletions(-) diff --git a/arch/m68k/include/asm/fbio.h b/arch/m68k/include/asm/fbio.h index 590b923c470d3e..90ae409c6bdb4e 100644 --- a/arch/m68k/include/asm/fbio.h +++ b/arch/m68k/include/asm/fbio.h @@ -97,21 +97,6 @@ struct fbgattr { #define FBIOSVIDEO _IOW('F', 7, int) #define FBIOGVIDEO _IOR('F', 8, int) -struct fbcursor { - short set; /* what to set, choose from the list above */ - short enable; /* cursor on/off */ - struct fbcurpos pos; /* cursor position */ - struct fbcurpos hot; /* cursor hot spot */ - struct fbcmap cmap; /* color map info */ - struct fbcurpos size; /* cursor bit map size */ - char __user *image; /* cursor image bits */ - char __user *mask; /* cursor mask bits */ -}; - -/* set/get cursor attributes/shape */ -#define FBIOSCURSOR _IOW('F', 24, struct fbcursor) -#define FBIOGCURSOR _IOWR('F', 25, struct fbcursor) - /* set/get cursor position */ #define FBIOSCURPOS _IOW('F', 26, struct fbcurpos) #define FBIOGCURPOS _IOW('F', 27, struct fbcurpos) @@ -312,20 +297,6 @@ struct fbcmap32 { #define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32) #define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32) - -struct fbcursor32 { - short set; /* what to set, choose from the list above */ - short enable; /* cursor on/off */ - struct fbcurpos pos; /* cursor position */ - struct fbcurpos hot; /* cursor hot spot */ - struct fbcmap32 cmap; /* color map info */ - struct fbcurpos size; /* cursor bit map size */ - u32 image; /* cursor image bits */ - u32 mask; /* cursor mask bits */ -}; - -#define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32) -#define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32) #endif #endif /* __LINUX_FBIO_H */ diff --git a/arch/sparc/include/asm/fbio.h b/arch/sparc/include/asm/fbio.h index 02654cb95dec57..348994cc142973 100644 --- a/arch/sparc/include/asm/fbio.h +++ b/arch/sparc/include/asm/fbio.h @@ -57,17 +57,4 @@ struct fbcmap32 { #define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32) #define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32) -struct fbcursor32 { - short set; /* what to set, choose from the list above */ - short enable; /* cursor on/off */ - struct fbcurpos pos; /* cursor position */ - struct fbcurpos hot; /* cursor hot spot */ - struct fbcmap32 cmap; /* color map info */ - struct fbcurpos size; /* cursor bit map size */ - u32 image; /* cursor image bits */ - u32 mask; /* cursor mask bits */ -}; - -#define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32) -#define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32) #endif /* __LINUX_FBIO_H */ diff --git a/arch/sparc/include/uapi/asm/fbio.h b/arch/sparc/include/uapi/asm/fbio.h index 0dafe2c1eab740..bda278c2a7d091 100644 --- a/arch/sparc/include/uapi/asm/fbio.h +++ b/arch/sparc/include/uapi/asm/fbio.h @@ -94,21 +94,6 @@ struct fbgattr { #define FBIOSVIDEO _IOW('F', 7, int) #define FBIOGVIDEO _IOR('F', 8, int) -struct fbcursor { - short set; /* what to set, choose from the list above */ - short enable; /* cursor on/off */ - struct fbcurpos pos; /* cursor position */ - struct fbcurpos hot; /* cursor hot spot */ - struct fbcmap cmap; /* color map info */ - struct fbcurpos size; /* cursor bit map size */ - char __user *image; /* cursor image bits */ - char __user *mask; /* cursor mask bits */ -}; - -/* set/get cursor attributes/shape */ -#define FBIOSCURSOR _IOW('F', 24, struct fbcursor) -#define FBIOGCURSOR _IOWR('F', 25, struct fbcursor) - /* set/get cursor position */ #define FBIOSCURPOS _IOW('F', 26, struct fbcurpos) #define FBIOGCURPOS _IOW('F', 27, struct fbcurpos) diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c index 01a7110e61a76a..176dbfb5d3efca 100644 --- a/drivers/video/fbdev/sbuslib.c +++ b/drivers/video/fbdev/sbuslib.c @@ -214,32 +214,6 @@ static int fbiogetputcmap(struct fb_info *info, unsigned int cmd, unsigned long (unsigned long)p); } -static int fbiogscursor(struct fb_info *info, unsigned long arg) -{ - struct fbcursor __user *p = compat_alloc_user_space(sizeof(*p)); - struct fbcursor32 __user *argp = (void __user *)arg; - compat_uptr_t addr; - int ret; - - ret = copy_in_user(p, argp, - 2 * sizeof (short) + 2 * sizeof(struct fbcurpos)); - ret |= copy_in_user(&p->size, &argp->size, sizeof(struct fbcurpos)); - ret |= copy_in_user(&p->cmap, &argp->cmap, 2 * sizeof(int)); - ret |= get_user(addr, &argp->cmap.red); - ret |= put_user(compat_ptr(addr), &p->cmap.red); - ret |= get_user(addr, &argp->cmap.green); - ret |= put_user(compat_ptr(addr), &p->cmap.green); - ret |= get_user(addr, &argp->cmap.blue); - ret |= put_user(compat_ptr(addr), &p->cmap.blue); - ret |= get_user(addr, &argp->mask); - ret |= put_user(compat_ptr(addr), &p->mask); - ret |= get_user(addr, &argp->image); - ret |= put_user(compat_ptr(addr), &p->image); - if (ret) - return -EFAULT; - return info->fbops->fb_ioctl(info, FBIOSCURSOR, (unsigned long)p); -} - int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { switch (cmd) { @@ -248,8 +222,6 @@ int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar case FBIOGATTR: case FBIOSVIDEO: case FBIOGVIDEO: - case FBIOGCURSOR32: /* This is not implemented yet. - Later it should be converted... */ case FBIOSCURPOS: case FBIOGCURPOS: case FBIOGCURMAX: @@ -258,8 +230,6 @@ int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar return fbiogetputcmap(info, cmd, arg); case FBIOGETCMAP32: return fbiogetputcmap(info, cmd, arg); - case FBIOSCURSOR32: - return fbiogscursor(info, arg); default: return -ENOIOCTLCMD; } From patchwork Wed Oct 7 07:44:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 293234 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 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; }