blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1412 from emersion/drm-vla-overflow 

backend/drm: fix VLA overflow
This commit is contained in:
Drew DeVault 2018-12-04 18:19:55 -05:00 committed by GitHub
parent 3efc6bc363 491f1dbf75
commit 4fadde362f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/drm/drm.c
View File

@ -428,6 +428,19 @@ bool enable_drm_connector(struct wlr_output *output, bool enable) {
return true; return true;
} }
static ssize_t connector_index_from_crtc(struct wlr_drm_backend *drm,
struct wlr_drm_crtc *crtc) {
size_t i = 0;
struct wlr_drm_connector *conn;
wl_list_for_each(conn, &drm->outputs, link) {
if (conn->crtc == crtc) {
return i;
}
++i;
}
return -1;
}
static void realloc_planes(struct wlr_drm_backend *drm, const uint32_t *crtc_in, static void realloc_planes(struct wlr_drm_backend *drm, const uint32_t *crtc_in,
bool *changed_outputs) { bool *changed_outputs) {
wlr_log(WLR_DEBUG, "Reallocating planes"); wlr_log(WLR_DEBUG, "Reallocating planes");
@ -477,7 +490,10 @@ static void realloc_planes(struct wlr_drm_backend *drm, const uint32_t *crtc_in,
type, type,
c->id); c->id);
changed_outputs[crtc_res[i]] = true; ssize_t conn_idx = connector_index_from_crtc(drm, c);
if (conn_idx >= 0) {
changed_outputs[conn_idx] = true;
}
if (*old) { if (*old) {
finish_drm_surface(&(*old)->surf); finish_drm_surface(&(*old)->surf);
} }