mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-26 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: return on wlr_output_commit failures

Browse source 
There were two wlr_output_commit calls that were not being checked. If
the commits fail, apply_output_config should early return false instead
of continuing to apply more. In one of the two cases, it was possible
for output_enable to be called immediately after a commit failed for
wlr_output_enable. In some cases, wlroots will destroy the output when
it fails to enable. When this happens, it was possible for output_enable
to call apply_output_config again for the destroyed output. Since this
is a use-after-free, the wlr_output has already been reset to NULL
before freeing. This could results in wlr_output_enable or any of the
other wlr_output_* calls being called with NULL as the wlr_output.
This commit is contained in:
Brian Ashworth 2020-01-16 22:19:13 -05:00
parent 9d827ef493
commit 5904a68a39
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/config/output.c
View file

@ -328,7 +328,10 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
if (!oc || oc->dpms_state != DPMS_OFF) { if (!oc || oc->dpms_state != DPMS_OFF) {
sway_log(SWAY_DEBUG, "Enabling output %s", oc->name); sway_log(SWAY_DEBUG, "Enabling output %s", oc->name);
wlr_output_enable(wlr_output, true); wlr_output_enable(wlr_output, true);
wlr_output_commit(wlr_output); if (!wlr_output_commit(wlr_output)) {
sway_log(SWAY_ERROR, "Failed to enable output %s", oc->name);
return false;
}
} }
return output_enable(output, oc); return output_enable(output, oc);
} }
@ -421,7 +424,10 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
if (oc && oc->dpms_state == DPMS_OFF) { if (oc && oc->dpms_state == DPMS_OFF) {
sway_log(SWAY_DEBUG, "Turning off output %s", oc->name); sway_log(SWAY_DEBUG, "Turning off output %s", oc->name);
wlr_output_enable(wlr_output, false); wlr_output_enable(wlr_output, false);
wlr_output_commit(wlr_output); if (!wlr_output_commit(wlr_output)) {
sway_log(SWAY_ERROR, "Failed to turn off output %s", oc->name);
return false;
}
} }
if (oc && oc->max_render_time >= 0) { if (oc && oc->max_render_time >= 0) {