Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fbdev-for-6.12-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev fixes from Helge Deller:
- crash fix in fbcon_putcs
- avoid a possible string memory overflow in sisfb
- minor code optimizations in omapfb and fbcon
* tag 'fbdev-for-6.12-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
fbdev: sisfb: Fix strbuf array overflow
fbcon: break earlier in search_fb_in_map and search_for_mapped_con
fbdev: omapfb: Call of_node_put(ep) only once in omapdss_of_find_source_for_first_ep()
fbcon: Fix a NULL pointer dereference issue in fbcon_putcs
+11
-8
+8
-2
drivers/video/fbdev/core/fbcon.c
+8
-2
drivers/video/fbdev/core/fbcon.c
···
512
512
int i, retval = 0;
513
513
514
514
for (i = first_fb_vc; i <= last_fb_vc; i++) {
515
-
if (con2fb_map[i] == idx)
515
+
if (con2fb_map[i] == idx) {
516
516
retval = 1;
517
+
break;
518
+
}
517
519
}
518
520
return retval;
519
521
}
···
525
523
int i, retval = 0;
526
524
527
525
for (i = first_fb_vc; i <= last_fb_vc; i++) {
528
-
if (con2fb_map[i] != -1)
526
+
if (con2fb_map[i] != -1) {
529
527
retval = 1;
528
+
break;
529
+
}
530
530
}
531
531
return retval;
532
532
}
···
865
861
return err;
866
862
867
863
fbcon_add_cursor_work(info);
864
+
} else if (vc) {
865
+
set_blitting_type(vc, info);
868
866
}
869
867
870
868
con2fb_map[unit] = newidx;
+2
-5
drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
+2
-5
drivers/video/fbdev/omap2/omapfb/dss/dss-of.c
···
129
129
return ERR_PTR(-EINVAL);
130
130
131
131
src_port = of_graph_get_remote_port(ep);
132
-
if (!src_port) {
133
-
of_node_put(ep);
134
-
return ERR_PTR(-EINVAL);
135
-
}
136
-
137
132
of_node_put(ep);
133
+
if (!src_port)
134
+
return ERR_PTR(-EINVAL);
138
135
139
136
src = omap_dss_find_output_by_port_node(src_port);
140
137
+1
-1
drivers/video/fbdev/sis/sis_main.c
+1
-1
drivers/video/fbdev/sis/sis_main.c