fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-24 10:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

uinput: change strcpy/strcat usage for snprintf

Browse source 
Better protection against buffer overflow, though by the time someone
is manipulating your sysfs, libevdev is unlikely to be the biggest worry.

Slight change in functionality: before we checked the timestamp of
/sys/devices/virtual/input/inputXYZ before looking at /inputXYZ/name, now we
just check the name file for the timestamp.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Peter Hutterer 2014-06-19 14:20:58 +10:00
parent 2ff45c73a1
commit 734aadb487
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libevdev/libevdev-uinput.c
View file

@ -218,8 +218,12 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinput_dev)
int fd, len;
struct stat st;
strcpy(buf, SYS_INPUT_DIR);
strcat(buf, namelist[i]->d_name);
rc = snprintf(buf, sizeof(buf), "%s%s/name",
SYS_INPUT_DIR,
namelist[i]->d_name);
if (rc < 0 || (size_t)rc >= sizeof(buf)) {
continue;
}
if (stat(buf, &st) == -1)
continue;
@ -230,7 +234,6 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinput_dev)
continue;
/* created within time frame */
strcat(buf, "/name");
fd = open(buf, O_RDONLY);
if (fd < 0)
continue;
@ -247,8 +250,14 @@ fetch_syspath_and_devnode(struct libevdev_uinput *uinput_dev)
log_info(NULL, "multiple identical devices found. syspath is unreliable\n");
break;
} else {
strcpy(buf, SYS_INPUT_DIR);
strcat(buf, namelist[i]->d_name);
rc = snprintf(buf, sizeof(buf), "%s%s",
SYS_INPUT_DIR,
namelist[i]->d_name);
if (rc < 0 || (size_t)rc >= sizeof(buf)) {
log_error(NULL, "Invalid syspath, syspath is unreliable\n");
break;
}
uinput_dev->syspath = strdup(buf);
uinput_dev->devnode = fetch_device_node(buf);
}