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

sna: Make sure we assert our Master status before copying the fbcon 

Being able to read back the fbcon handle as a non-Master process is an
information leak that will be fixed. We should already be Master by
this point by virtue of the sequence in which we obtain the device fd.
However, to be pedagogically correct, call drmSetMaster() before the
fbcon copy.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-08-25 23:05:32 +01:00
parent f62173af1a
commit e98cc0b1ce
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sna/sna_driver.c
View File

@ -192,15 +192,12 @@ sna_set_fallback_mode(ScrnInfoPtr scrn)
#endif
}
static Bool sna_become_master(struct sna *sna)
static Bool sna_set_desired_mode(struct sna *sna)
{
ScrnInfoPtr scrn = sna->scrn;
DBG(("%s\n", __FUNCTION__));
if (intel_get_master(scrn))
return FALSE;
if (!xf86SetDesiredModes(scrn)) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"failed to restore desired modes on VT switch\n");
@ -269,13 +266,21 @@ static Bool sna_create_screen_resources(ScreenPtr screen)
assert(sna->front == new_front);
screen->DestroyPixmap(new_front); /* transfer ownership to screen */
if (intel_get_master(sna->scrn)) {
xf86DrvMsg(screen->myNum, X_ERROR,
"[intel] Failed to become DRM master\n");
screen->DestroyPixmap(sna->front);
sna->front = NULL;
return FALSE;
}
/* Only preserve the fbcon, not any subsequent server regens */
if (serverGeneration == 1 && (sna->flags & SNA_IS_HOSTED) == 0)
sna_copy_fbcon(sna);
if (!sna_become_master(sna)) {
if (!sna_set_desired_mode(sna)) {
xf86DrvMsg(screen->myNum, X_ERROR,
"[intel] Failed to become DRM master\n");
"[intel] Failed to set initial mode\n");
screen->DestroyPixmap(sna->front);
sna->front = NULL;
return FALSE;
@ -1007,7 +1012,10 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
struct sna *sna = to_sna(scrn);
DBG(("%s\n", __FUNCTION__));
if (!sna_become_master(sna))
if (intel_get_master(scrn))
return FALSE;
if (!sna_set_desired_mode(sna))
return FALSE;
if (sna->flags & SNA_REPROBE) {