fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-04-05 12:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

udev: restrict the seat ID to 256 characters

Browse source 
Anything longer than that is likely a bug.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-02-08 11:07:15 +10:00
parent 3a89f95b55
commit 4353ed9152
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/udev-seat.c
View file

@ -382,6 +382,15 @@ libinput_udev_assign_seat(struct libinput *libinput,
{
struct udev_input *input = (struct udev_input*)libinput;
if (!seat_id)
return -1;
if (strlen(seat_id) > 256) {
log_bug_client(libinput,
"Unexpected seat id, limited to 256 characters.\n");
return -1;
}
/* We cannot do this during udev_create_context because the log
* handler isn't set up there but we really want to log to the right
* place if the quirks run into parser errors. So we have to do it
@ -389,9 +398,6 @@ libinput_udev_assign_seat(struct libinput *libinput,
*/
libinput_init_quirks(libinput);
if (!seat_id)
return -1;
if (libinput->interface_backend != &interface_backend) {
log_bug_client(libinput, "Mismatching backends.\n");
return -1;

25
test/test-udev.c
View file

@ -130,6 +130,30 @@ START_TEST(udev_create_empty_seat)
}
END_TEST
START_TEST(udev_create_seat_too_long)
{
struct libinput *li;
struct udev *udev;
char seatname[258];
memset(seatname, 'a', sizeof(seatname) - 1);
seatname[sizeof(seatname) - 1] = '\0';
udev = udev_new();
ck_assert(udev != NULL);
li = libinput_udev_create_context(&simple_interface, NULL, udev);
litest_set_log_handler_bug(li);
ck_assert_int_eq(libinput_udev_assign_seat(li, seatname), -1);
litest_assert_empty_queue(li);
libinput_unref(li);
udev_unref(udev);
}
END_TEST
START_TEST(udev_set_user_data)
{
struct libinput *li;
@ -651,6 +675,7 @@ TEST_COLLECTION(udev)
litest_add_no_device("udev:create", udev_create_NULL);
litest_add_no_device("udev:create", udev_create_seat0);
litest_add_no_device("udev:create", udev_create_empty_seat);
litest_add_no_device("udev:create", udev_create_seat_too_long);
litest_add_no_device("udev:create", udev_set_user_data);
litest_add_no_device("udev:seat", udev_added_seat_default);