X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libudev%2Flibudev-device.c;h=5811490a34599cbfdb4078938bda213a33c405fa;hp=7e6b7f1ce72c6a2bb4c4e58a538a2fba115c1b6e;hb=d80f8ffd1a182fe7fff9816e8a4efc09e877964b;hpb=f712894dd4c2a2d8e374de133b7ed854e203fa96

diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index 7e6b7f1ce..5811490a3 100644
--- a/libudev/libudev-device.c
+++ b/libudev/libudev-device.c
@@ -279,7 +279,7 @@ int udev_device_read_db(struct udev_device *udev_device)
 		return 0;
 	}
 
-	f = fopen(filename, "r");
+	f = fopen(filename, "re");
 	if (f == NULL) {
 		dbg(udev_device->udev, "error reading db file %s: %m\n", filename);
 		return -1;
@@ -339,7 +339,7 @@ int udev_device_read_uevent_file(struct udev_device *udev_device)
 		return 0;
 
 	util_strscpyl(filename, sizeof(filename), udev_device->syspath, "/uevent", NULL);
-	f = fopen(filename, "r");
+	f = fopen(filename, "re");
 	if (f == NULL)
 		return -1;
 	udev_device->uevent_loaded = true;
@@ -1164,7 +1164,7 @@ const char *udev_device_get_sysattr_value(struct udev_device *udev_device, const
 		goto out;
 
 	/* read attribute value */
-	fd = open(path, O_RDONLY);
+	fd = open(path, O_RDONLY|O_CLOEXEC);
 	if (fd < 0) {
 		dbg(udev_device->udev, "attribute '%s' can not be opened\n", path);
 		goto out;