From d5f65b8bf54574e45d73938702fb5505449c1b5d Mon Sep 17 00:00:00 2001 From: Frank Binns Date: Thu, 4 Aug 2016 15:15:23 +0100 Subject: [PATCH] loader: fix sysfs uevent file parsing When trying to get a device name for an fd using sysfs, it would always fail as it was expecting key/value pairs to be delimited by '\0', which is not the case. Signed-off-by: Frank Binns Reviewed-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/loader/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/loader/loader.c b/src/loader/loader.c index 56ffc5d77a7..3e60e4ccf1d 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -645,7 +645,7 @@ sysfs_get_device_name_for_fd(int fd) unsigned int maj, min; FILE *f; char buf[0x40]; - static const char match[9] = "\0DEVNAME="; + static const char match[9] = "\nDEVNAME="; int expected = 1; if (dev_node_from_fd(fd, &maj, &min) < 0) @@ -668,8 +668,10 @@ sysfs_get_device_name_for_fd(int fd) } strcpy(buf, "/dev/"); - if (fgets(buf + 5, sizeof(buf) - 5, f)) + if (fgets(buf + 5, sizeof(buf) - 5, f)) { + buf[strcspn(buf, "\n")] = '\0'; device_name = strdup(buf); + } fclose(f); return device_name;