summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2009-02-25 17:48:40 +0200
committerJohan Hedberg <johan.hedberg@nokia.com>2009-02-25 17:48:40 +0200
commit1c195ab280da561f38e54449e4eb3d6882c69b3b (patch)
tree12583570730c9e5a1505416aa445666aa1449f6b /input
parentd7aa6d1b2d6f3fc48b8287ea04c741078b22f2da (diff)
Fix strncpy length parameters to avoid non-nul-terminated strings
Diffstat (limited to 'input')
-rw-r--r--input/device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/input/device.c b/input/device.c
index a41df177..0090bd4b 100644
--- a/input/device.c
+++ b/input/device.c
@@ -177,7 +177,7 @@ static int uinput_create(char *name)
memset(&dev, 0, sizeof(dev));
if (name)
- strncpy(dev.name, name, UINPUT_MAX_NAME_SIZE);
+ strncpy(dev.name, name, UINPUT_MAX_NAME_SIZE - 1);
dev.id.bustype = BUS_BLUETOOTH;
dev.id.vendor = 0x0000;
@@ -635,7 +635,7 @@ static int hidp_add_connection(const struct input_device *idev,
}
if (idev->name)
- strncpy(req->name, idev->name, 128);
+ strncpy(req->name, idev->name, sizeof(req->name) - 1);
/* Encryption is mandatory for keyboards */
if (req->subclass & 0x40) {