ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libblkid: open device in nonblock mode. 

When autoclose is set (kernel default but many distributions reverse the
setting) opening a CD-rom device causes the tray to close.

The function of blkid is to report the current state of the device and
not to change it. Hence it should use O_NONBLOCK when opening the
device to avoid closing a CD-rom tray.

blkid is used liberally in scripts so it can potentially interfere with
the user operating the CD-rom hardware.

[kzak@redhat.com: add O_NONBLOCK also to:
                  - wipefs
                  - blkid_new_probe_from_filename()
                  - blkid_evaluate_tag()]

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Michal Suchanek 2019-11-04 21:23:15 +01:00 committed by Karel Zak
parent b4402de7a0
commit 39f5af2598
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libblkid/src/evaluate.c
View File

@ -70,7 +70,7 @@ static int verify_tag(const char *devname, const char *name, const char *value)
blkid_probe_enable_partitions(pr, TRUE);
blkid_probe_set_partitions_flags(pr, BLKID_PARTS_ENTRY_DETAILS);
fd = open(devname, O_RDONLY|O_CLOEXEC);
fd = open(devname, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
if (fd < 0) {
errsv = errno;
goto done;

2
libblkid/src/probe.c
View File

@ -203,7 +203,7 @@ blkid_probe blkid_new_probe_from_filename(const char *filename)
int fd;
blkid_probe pr = NULL;
fd = open(filename, O_RDONLY|O_CLOEXEC);
fd = open(filename, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
if (fd < 0)
return NULL;

2
libblkid/src/verify.c
View File

@ -126,7 +126,7 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev)
}
}
fd = open(dev->bid_name, O_RDONLY|O_CLOEXEC);
fd = open(dev->bid_name, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
if (fd < 0) {
DBG(PROBE, ul_debug("blkid_verify: error %m (%d) while "
"opening %s", errno,

2
misc-utils/blkid.c
View File

@ -499,7 +499,7 @@ static int lowprobe_device(blkid_probe pr, const char *devname,
int rc = 0;
static int first = 1;
fd = open(devname, O_RDONLY|O_CLOEXEC);
fd = open(devname, O_RDONLY|O_CLOEXEC|O_NONBLOCK);
if (fd < 0) {
warn(_("error: %s"), devname);
return BLKID_EXIT_NOTFOUND;

2
misc-utils/wipefs.c
View File

@ -386,7 +386,7 @@ new_probe(const char *devname, int mode)
return NULL;
if (mode) {
int fd = open(devname, mode);
int fd = open(devname, mode | O_NONBLOCK);
if (fd < 0)
goto error;