Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Sanitize output->crtc before falling back oto xf86InitialConfiguration 

During initialisation, we stash the currently attached CRTC id in
output->crtc. This is fine as ordinarily we would not dereference
output->crtc until after it had been assigned a real CRTC. However,

commit 6fda305e2f
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Oct 9 15:59:42 2013 +0100

    sna: Append the current mode to the output list if not found

introduces such an early dereference and causes a crash if we fail to
probe the KMS configuration (usually due to a user override).

Reported-by: Łukasz Maśko <ed@yen.ipipan.waw.pl>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-10-10 16:22:45 +01:00
parent 700a845cc6
commit f0bd716425
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sna/sna_display.c
View File

@ -3225,8 +3225,10 @@ static bool sna_probe_initial_configuration(struct sna *sna)
xf86OutputPtr output = config->output[i];
uint32_t crtc_id;
if (to_sna_output(output) == NULL)
if (to_sna_output(output) == NULL) {
assert(output->crtc == NULL);
continue;
}
crtc_id = (uintptr_t)output->crtc;
output->crtc = NULL;
@ -3320,6 +3322,16 @@ static bool sna_probe_initial_configuration(struct sna *sna)
return scrn->modes != NULL;
}
static void
sanitize_outputs(struct sna *sna)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
int i;
for (i = 0; i < config->num_output; i++)
config->output[i]->crtc = NULL;
}
static void
sna_crtc_config_notify(ScreenPtr screen)
{
@ -3372,8 +3384,10 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
if (!sna_mode_fake_init(sna, num_fake))
return false;
if (!sna_probe_initial_configuration(sna))
if (!sna_probe_initial_configuration(sna)) {
sanitize_outputs(sna);
xf86InitialConfiguration(scrn, TRUE);
}
sna_setup_provider(scrn);
return scrn->modes != NULL;