From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 9 Mar 2021 07:11:52 +0000 (+0900)
Subject: sd-device: check the validity of device id
X-Git-Tag: v249-rc1~315^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db2bad4368517062aaf4debbba89af1bb377b9a5;p=thirdparty%2Fsystemd.git

sd-device: check the validity of device id

The device id is used as filename under /run/udev/data or
/run/udev/watch.
---

diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index decf9ae1d1c..233bb6df5d2 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -1306,6 +1306,9 @@ int device_get_device_id(sd_device *device, const char **ret) {
                                 return -ENOMEM;
                 }
 
+                if (!filename_is_valid(id))
+                        return -EINVAL;
+
                 device->device_id = TAKE_PTR(id);
         }