Return BadValue if the server failed to init the keyboard. (#21278)

If keyboard init failed, we don't have a useful keymap and thus can't
continue.
This is essentially 0e15697b53c9448ce9911aa6499b2ea0bda92af6 from
xserver ported over here.

X.Org Bug 21278 <http://bugs.freedesktop.org/show_bug.cgi?id=21278>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/kbd.c b/src/kbd.c
index 767ff6b..1afa560 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -424,7 +424,14 @@ KbdProc(DeviceIntPtr device, int what)
              rmlvo.variant = xkb_variant;
              rmlvo.options = xkb_options;
 
-             InitKeyboardDeviceStruct(device, &rmlvo, KbdBell, KbdCtrl);
+             if (!InitKeyboardDeviceStruct(device, &rmlvo, KbdBell, KbdCtrl))
+             {
+                 xf86Msg(X_ERROR, "%s: Keyboard initialization failed. This "
+                         "could be a missing or incorrect setup of "
+                         "xkeyboard-config.\n", device->name);
+
+                 return BadValue;
+             }
          }
 #else
          {