vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

hostdisk: Set linux file descriptor to O_CLOEXEC as default

Browse source 
We are often bothered by this sort of lvm warning while running grub-install
every now and then:

  File descriptor 4 (/dev/vda1) leaked on vgs invocation. Parent PID 1991: /usr/sbin/grub2-install

The requirement related to the warning is dictated in the lvm man page:

  "On invocation, lvm requires that only the standard file descriptors stdin,
  stdout and stderr are available.  If others are found, they get closed and
  messages are issued warning about the leak.  This warning can be suppressed by
  setting the environment variable LVM_SUPPRESS_FD_WARNINGS."

While it could be disabled through settings, most Linux distributions seem to
enable it by default and the justification provided by the developer looks to
be valid to me: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=466138#15

Rather than trying to close and reopen the file descriptor to the same file
multiple times, which is rather cumbersome, for the sake of no vgs invocation
could happen in between. This patch enables the close-on-exec flag (O_CLOEXEC)
for new file descriptor returned by the open() system call, making it closed
thus not inherited by the child process forked and executed by the exec()
family of functions.

Fixes Debian bug #466138.

Signed-off-by: Michael Chang <mchang@suse.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Michael Chang 2019-11-05 09:19:26 +00:00 committed by Daniel Kiper
parent 28a7e597de
commit 42acdd3b40
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
grub-core/osdep/linux/hostdisk.c
View file

@ -366,6 +366,9 @@ grub_util_fd_open_device (const grub_disk_t disk, grub_disk_addr_t sector, int f
#ifdef O_BINARY #ifdef O_BINARY
flags |= O_BINARY; flags |= O_BINARY;
#endif #endif
#ifdef O_CLOEXEC
flags |= O_CLOEXEC;
#endif
/* Linux has a bug that the disk cache for a whole disk is not consistent /* Linux has a bug that the disk cache for a whole disk is not consistent
with the one for a partition of the disk. */ with the one for a partition of the disk. */

3
grub-core/osdep/unix/hostdisk.c
View file

@ -164,6 +164,9 @@ grub_util_fd_open (const char *os_dev, int flags)
#ifdef O_BINARY #ifdef O_BINARY
flags |= O_BINARY; flags |= O_BINARY;
#endif #endif
#ifdef O_CLOEXEC
flags |= O_CLOEXEC;
#endif
return open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR); return open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
} }