Skip to content

Commit 453bd91

Browse files
committed
fbdev: Don't re-validate info->state in fb_ops implementations
The file-op entry points fb_read() and fb_write() verify that info->state has been set to FBINFO_STATE_RUNNING. Remove the same test from the implementations of struct fb_ops.{fb_read,fb_write}. v2: * also remove test from ivtvfb, braodsheetfb, hecubafb and metronomefb (Geert) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Tested-by: Sui Jingfeng <suijingfeng@loongson.cn> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Helge Deller <deller@gmx.de> Link: https://patchwork.freedesktop.org/patch/msgid/20230428122452.4856-17-tzimmermann@suse.de
1 parent f06875d commit 453bd91

6 files changed

Lines changed: 0 additions & 24 deletions

File tree

drivers/media/pci/ivtv/ivtvfb.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,6 @@ static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
378378
unsigned long dma_size;
379379
u16 lead = 0, tail = 0;
380380

381-
if (info->state != FBINFO_STATE_RUNNING)
382-
return -EPERM;
383-
384381
total_size = info->screen_size;
385382

386383
if (total_size == 0)

drivers/video/fbdev/broadsheetfb.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,9 +1013,6 @@ static ssize_t broadsheetfb_write(struct fb_info *info, const char __user *buf,
10131013
int err = 0;
10141014
unsigned long total_size;
10151015

1016-
if (info->state != FBINFO_STATE_RUNNING)
1017-
return -EPERM;
1018-
10191016
total_size = info->fix.smem_len;
10201017

10211018
if (p > total_size)

drivers/video/fbdev/core/fb_sys_fops.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ ssize_t fb_sys_read(struct fb_info *info, char __user *buf, size_t count,
2222
unsigned long total_size, c;
2323
ssize_t ret;
2424

25-
if (info->state != FBINFO_STATE_RUNNING)
26-
return -EPERM;
27-
2825
total_size = info->screen_size;
2926

3027
if (total_size == 0)
@@ -64,9 +61,6 @@ ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
6461
unsigned long total_size, c;
6562
size_t ret;
6663

67-
if (info->state != FBINFO_STATE_RUNNING)
68-
return -EPERM;
69-
7064
total_size = info->screen_size;
7165

7266
if (total_size == 0)

drivers/video/fbdev/hecubafb.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ static ssize_t hecubafb_write(struct fb_info *info, const char __user *buf,
163163
int err = 0;
164164
unsigned long total_size;
165165

166-
if (info->state != FBINFO_STATE_RUNNING)
167-
return -EPERM;
168-
169166
total_size = info->fix.smem_len;
170167

171168
if (p > total_size)

drivers/video/fbdev/metronomefb.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,9 +523,6 @@ static ssize_t metronomefb_write(struct fb_info *info, const char __user *buf,
523523
int err = 0;
524524
unsigned long total_size;
525525

526-
if (info->state != FBINFO_STATE_RUNNING)
527-
return -EPERM;
528-
529526
total_size = info->fix.smem_len;
530527

531528
if (p > total_size)

drivers/video/fbdev/sm712fb.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,9 +1031,6 @@ static ssize_t smtcfb_read(struct fb_info *info, char __user *buf,
10311031
if (!info || !info->screen_base)
10321032
return -ENODEV;
10331033

1034-
if (info->state != FBINFO_STATE_RUNNING)
1035-
return -EPERM;
1036-
10371034
total_size = info->screen_size;
10381035

10391036
if (total_size == 0)
@@ -1097,9 +1094,6 @@ static ssize_t smtcfb_write(struct fb_info *info, const char __user *buf,
10971094
if (!info || !info->screen_base)
10981095
return -ENODEV;
10991096

1100-
if (info->state != FBINFO_STATE_RUNNING)
1101-
return -EPERM;
1102-
11031097
total_size = info->screen_size;
11041098

11051099
if (total_size == 0)

0 commit comments

Comments
 (0)