randr: Do not crash if slave screen does not have provider.

Submitted by Michal Srb on April 12, 2018, 12:29 p.m.


Message ID 20180412122928.22770-1-msrb@suse.com
State New
Headers show
Series "randr: Do not crash if slave screen does not have provider." ( rev: 1 ) in X.org

Not browsing as part of any series.

Commit Message

Michal Srb April 12, 2018, 12:29 p.m.
All GPU screens are attached as unbound GPUs to master, even if they have no
capabilities or the provider field is null. Handle that case in RRTellChanged.
This prevents crash in setups with for example two qxl devices, or fbdev and
qxl device. I am not sure if it is a proper fix and not just papering over a
bug somewhere else, but there are more places that test whether the provider
is set, so maybe it is correct way.

I would think that if a slave screen does not have provider, there is no reason
for it to become an unbound GPU in master's slave_list. Similarly if master has
no provider, then having anything in slave_list is useless. But it seems the
AttachUnboundGPU and the rest of the code handling screen to GPU screen
attachments does not know about randr's privates, so it can not check whether
provider is there.

 randr/randr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/randr/randr.c b/randr/randr.c
index feb54bcc8..661f66da2 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -643,7 +643,9 @@  RRTellChanged(ScreenPtr pScreen)
         xorg_list_for_each_entry(iter, &master->slave_list, slave_head) {
             pSlaveScrPriv = rrGetScrPriv(iter);
-            pSlaveScrPriv->provider->changed = FALSE;
+            if (pSlaveScrPriv->provider) {
+                pSlaveScrPriv->provider->changed = FALSE;
+            }
             if (iter->is_output_slave) {
                 for (i = 0; i < pSlaveScrPriv->numOutputs; i++)
                     pSlaveScrPriv->outputs[i]->changed = FALSE;