diff options
| author | Roel Kluin <12o3l@tiscali.nl> | 2008-04-18 00:25:18 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-24 13:25:08 -0400 |
| commit | 8c6deb9c8fd29feaeae3aae500608beac777ea9e (patch) | |
| tree | 21378c6be41196d044a0c56c443bb376a0b8d2cf /drivers/input/serio | |
| parent | d0478d0ad7a58f36afa03e57afe14955c2943466 (diff) | |
Input: i8042 - fix incorrect usage of strncpy and strncat
Fix incorrect length argument for strncpy and strncat by replacing them with
strlcpy and strlcat
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 60931aceb828..5ece9f56babc 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
| @@ -370,10 +370,10 @@ static int i8042_pnp_kbd_probe(struct pnp_dev *dev, const struct pnp_device_id * | |||
| 370 | if (pnp_irq_valid(dev,0)) | 370 | if (pnp_irq_valid(dev,0)) |
| 371 | i8042_pnp_kbd_irq = pnp_irq(dev, 0); | 371 | i8042_pnp_kbd_irq = pnp_irq(dev, 0); |
| 372 | 372 | ||
| 373 | strncpy(i8042_pnp_kbd_name, did->id, sizeof(i8042_pnp_kbd_name)); | 373 | strlcpy(i8042_pnp_kbd_name, did->id, sizeof(i8042_pnp_kbd_name)); |
| 374 | if (strlen(pnp_dev_name(dev))) { | 374 | if (strlen(pnp_dev_name(dev))) { |
| 375 | strncat(i8042_pnp_kbd_name, ":", sizeof(i8042_pnp_kbd_name)); | 375 | strlcat(i8042_pnp_kbd_name, ":", sizeof(i8042_pnp_kbd_name)); |
| 376 | strncat(i8042_pnp_kbd_name, pnp_dev_name(dev), sizeof(i8042_pnp_kbd_name)); | 376 | strlcat(i8042_pnp_kbd_name, pnp_dev_name(dev), sizeof(i8042_pnp_kbd_name)); |
| 377 | } | 377 | } |
| 378 | 378 | ||
| 379 | i8042_pnp_kbd_devices++; | 379 | i8042_pnp_kbd_devices++; |
| @@ -391,10 +391,10 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id * | |||
| 391 | if (pnp_irq_valid(dev, 0)) | 391 | if (pnp_irq_valid(dev, 0)) |
| 392 | i8042_pnp_aux_irq = pnp_irq(dev, 0); | 392 | i8042_pnp_aux_irq = pnp_irq(dev, 0); |
| 393 | 393 | ||
| 394 | strncpy(i8042_pnp_aux_name, did->id, sizeof(i8042_pnp_aux_name)); | 394 | strlcpy(i8042_pnp_aux_name, did->id, sizeof(i8042_pnp_aux_name)); |
| 395 | if (strlen(pnp_dev_name(dev))) { | 395 | if (strlen(pnp_dev_name(dev))) { |
| 396 | strncat(i8042_pnp_aux_name, ":", sizeof(i8042_pnp_aux_name)); | 396 | strlcat(i8042_pnp_aux_name, ":", sizeof(i8042_pnp_aux_name)); |
| 397 | strncat(i8042_pnp_aux_name, pnp_dev_name(dev), sizeof(i8042_pnp_aux_name)); | 397 | strlcat(i8042_pnp_aux_name, pnp_dev_name(dev), sizeof(i8042_pnp_aux_name)); |
| 398 | } | 398 | } |
| 399 | 399 | ||
| 400 | i8042_pnp_aux_devices++; | 400 | i8042_pnp_aux_devices++; |