X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fscsi_id%2Fscsi_serial.c;fp=src%2Fudev%2Fscsi_id%2Fscsi_serial.c;h=378a73d8639d2f67cbb3f8f1f411bb029e616285;hb=c8a202b7d47f9d6bba3100a208abdadfc383499e;hp=2f2afcee6edfea097b8ba9ada823be2c605708c5;hpb=955d98c9c1104d469c2989dbfb58f58ee6fe9bdc;p=elogind.git

diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index 2f2afcee6..378a73d86 100644
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -818,7 +818,7 @@ int scsi_std_inquiry(struct udev *udev,
         struct stat statbuf;
         int err = 0;
 
-        fd = open(devname, O_RDONLY | O_NONBLOCK);
+        fd = open(devname, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
         if (fd < 0) {
                 log_debug("scsi_id: cannot open %s: %m", devname);
                 return 1;
@@ -866,7 +866,7 @@ int scsi_get_serial(struct udev *udev,
         for (cnt = 20; cnt > 0; cnt--) {
                 struct timespec duration;
 
-                fd = open(devname, O_RDONLY | O_NONBLOCK);
+                fd = open(devname, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
                 if (fd >= 0 || errno != EBUSY)
                         break;
                 duration.tv_sec = 0;