frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: die if we can't activate or init the VCP/VCK. 

If we have a busted xkb setup, the XKB initialization on the core devices
fails and leaves us with dev->key->xkbInfo == NULL. This in turn causes
segfaults lateron.

Return BadValue when the XKB configuration for a master device failed, and if
that happens for the VCP/VCK, die semi-gracefully.
The VCP init can only fail on OOM.

Reported by Aaron Plattner.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
This commit is contained in:
Peter Hutterer 2009-02-04 10:11:13 +10:00
parent db83671519
commit 0e15697b53
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dix/devices.c
View File

@ -488,8 +488,13 @@ CoreKeyboardProc(DeviceIntPtr pDev, int what)
switch (what) { switch (what) {
case DEVICE_INIT: case DEVICE_INIT:
XkbGetRulesDflts(&rmlvo); XkbGetRulesDflts(&rmlvo);
InitKeyboardDeviceStruct(pDev, &rmlvo, CoreKeyboardBell, if (!InitKeyboardDeviceStruct(pDev, &rmlvo, CoreKeyboardBell,
CoreKeyboardCtl); CoreKeyboardCtl))
{
ErrorF("Keyboard initialization failed. This could be a missing "
"or incorrect setup of xkeyboard-config.\n");
return BadValue;
}
return Success; return Success;
case DEVICE_ON: case DEVICE_ON:
@ -519,9 +524,14 @@ CorePointerProc(DeviceIntPtr pDev, int what)
case DEVICE_INIT: case DEVICE_INIT:
for (i = 1; i <= 32; i++) for (i = 1; i <= 32; i++)
map[i] = i; map[i] = i;
InitPointerDeviceStruct((DevicePtr)pDev, map, 32, if (!InitPointerDeviceStruct((DevicePtr)pDev, map, 32,
(PtrCtrlProcPtr)NoopDDA, (PtrCtrlProcPtr)NoopDDA,
GetMotionHistorySize(), 2); GetMotionHistorySize(), 2))
{
ErrorF("Could not initialize device '%s'. Out of memory.\n",
pDev->name);
return BadAlloc; /* IPDS only fails on allocs */
}
pDev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2; pDev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;
pDev->last.valuators[0] = pDev->valuator->axisVal[0]; pDev->last.valuators[0] = pDev->valuator->axisVal[0];
pDev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2; pDev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;
@ -554,11 +564,12 @@ InitCoreDevices(void)
&inputInfo.keyboard) != Success) &inputInfo.keyboard) != Success)
FatalError("Failed to allocate core devices"); FatalError("Failed to allocate core devices");
ActivateDevice(inputInfo.pointer); if (ActivateDevice(inputInfo.pointer) != Success ||
ActivateDevice(inputInfo.keyboard); ActivateDevice(inputInfo.keyboard) != Success)
EnableDevice(inputInfo.pointer); FatalError("Failed to activate core devices.");
EnableDevice(inputInfo.keyboard); if (!EnableDevice(inputInfo.pointer) ||
!EnableDevice(inputInfo.keyboard))
FatalError("Failed to enable core devices.");
} }
/** /**