Commit ea08c6fa authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: fix potential overflows in driver/input/keyboard

Change all sprintfs into snprintfs to make sure we won't stomp on
data adjacent to our buffers.
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent a21466cc
...@@ -776,12 +776,15 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd) ...@@ -776,12 +776,15 @@ static void atkbd_set_device_attrs(struct atkbd *atkbd)
int i; int i;
if (atkbd->extra) if (atkbd->extra)
sprintf(atkbd->name, "AT Set 2 Extra keyboard"); snprintf(atkbd->name, sizeof(atkbd->name),
"AT Set 2 Extra keyboard");
else else
sprintf(atkbd->name, "AT %s Set %d keyboard", snprintf(atkbd->name, sizeof(atkbd->name),
"AT %s Set %d keyboard",
atkbd->translated ? "Translated" : "Raw", atkbd->set); atkbd->translated ? "Translated" : "Raw", atkbd->set);
sprintf(atkbd->phys, "%s/input0", atkbd->ps2dev.serio->phys); snprintf(atkbd->phys, sizeof(atkbd->phys),
"%s/input0", atkbd->ps2dev.serio->phys);
input_dev->name = atkbd->name; input_dev->name = atkbd->name;
input_dev->phys = atkbd->phys; input_dev->phys = atkbd->phys;
......
...@@ -384,18 +384,21 @@ lkkbd_detection_done (struct lkkbd *lk) ...@@ -384,18 +384,21 @@ lkkbd_detection_done (struct lkkbd *lk)
*/ */
switch (lk->id[4]) { switch (lk->id[4]) {
case 1: case 1:
sprintf (lk->name, "DEC LK201 keyboard"); strlcpy (lk->name, "DEC LK201 keyboard",
sizeof (lk->name));
if (lk201_compose_is_alt) if (lk201_compose_is_alt)
lk->keycode[0xb1] = KEY_LEFTALT; lk->keycode[0xb1] = KEY_LEFTALT;
break; break;
case 2: case 2:
sprintf (lk->name, "DEC LK401 keyboard"); strlcpy (lk->name, "DEC LK401 keyboard",
sizeof (lk->name));
break; break;
default: default:
sprintf (lk->name, "Unknown DEC keyboard"); strlcpy (lk->name, "Unknown DEC keyboard",
sizeof (lk->name));
printk (KERN_ERR "lkkbd: keyboard on %s is unknown, " printk (KERN_ERR "lkkbd: keyboard on %s is unknown, "
"please report to Jan-Benedict Glaw " "please report to Jan-Benedict Glaw "
"<jbglaw@lug-owl.de>\n", lk->phys); "<jbglaw@lug-owl.de>\n", lk->phys);
......
...@@ -96,7 +96,7 @@ static int nkbd_connect(struct serio *serio, struct serio_driver *drv) ...@@ -96,7 +96,7 @@ static int nkbd_connect(struct serio *serio, struct serio_driver *drv)
nkbd->serio = serio; nkbd->serio = serio;
nkbd->dev = input_dev; nkbd->dev = input_dev;
sprintf(nkbd->phys, "%s/input0", serio->phys); snprintf(nkbd->phys, sizeof(nkbd->phys), "%s/input0", serio->phys);
memcpy(nkbd->keycode, nkbd_keycode, sizeof(nkbd->keycode)); memcpy(nkbd->keycode, nkbd_keycode, sizeof(nkbd->keycode));
input_dev->name = "Newton Keyboard"; input_dev->name = "Newton Keyboard";
......
...@@ -263,7 +263,7 @@ static int sunkbd_connect(struct serio *serio, struct serio_driver *drv) ...@@ -263,7 +263,7 @@ static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)
goto fail; goto fail;
} }
sprintf(sunkbd->name, "Sun Type %d keyboard", sunkbd->type); snprintf(sunkbd->name, sizeof(sunkbd->name), "Sun Type %d keyboard", sunkbd->type);
memcpy(sunkbd->keycode, sunkbd_keycode, sizeof(sunkbd->keycode)); memcpy(sunkbd->keycode, sunkbd_keycode, sizeof(sunkbd->keycode));
input_dev->name = sunkbd->name; input_dev->name = sunkbd->name;
......
...@@ -100,7 +100,7 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv) ...@@ -100,7 +100,7 @@ static int xtkbd_connect(struct serio *serio, struct serio_driver *drv)
xtkbd->serio = serio; xtkbd->serio = serio;
xtkbd->dev = input_dev; xtkbd->dev = input_dev;
sprintf(xtkbd->phys, "%s/input0", serio->phys); snprintf(xtkbd->phys, sizeof(xtkbd->phys), "%s/input0", serio->phys);
memcpy(xtkbd->keycode, xtkbd_keycode, sizeof(xtkbd->keycode)); memcpy(xtkbd->keycode, xtkbd_keycode, sizeof(xtkbd->keycode));
input_dev->name = "XT Keyboard"; input_dev->name = "XT Keyboard";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment