nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-21 22:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

backend/drm: prevent out-of-bounds array access on unknown subpixel

Browse Source 
If the kernel adds new enum entries for subpixel, don't read past
the end of the subpixel_map array.
This commit is contained in:
Simon Ser 2022-12-13 18:27:58 +01:00 committed by Simon Zeni
parent bde68b1df7
commit c675380c56
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/drm/drm.c
View File

@ -1245,7 +1245,11 @@ static void connect_drm_connector(struct wlr_drm_connector *wlr_conn,
wlr_conn->output.phys_height = drm_conn->mmHeight;
wlr_log(WLR_INFO, "Physical size: %"PRId32"x%"PRId32,
wlr_conn->output.phys_width, wlr_conn->output.phys_height);
wlr_conn->output.subpixel = subpixel_map[drm_conn->subpixel];
if (drm_conn->subpixel < sizeof(subpixel_map) / sizeof(subpixel_map[0])) {
wlr_conn->output.subpixel = subpixel_map[drm_conn->subpixel];
} else {
wlr_log(WLR_ERROR, "Unknown subpixel value: %d", (int)drm_conn->subpixel);
}
get_drm_connector_props(drm->fd, wlr_conn->id, &wlr_conn->props);