pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/removables: open /proc/self/mountinfo with CLOEXEC

Browse source
This commit is contained in:
Daniel Eklöf 2022-03-29 18:21:44 +02:00
parent 4bb81e8940
commit 2b6f5b1e36
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/removables.c
View file

@ -164,11 +164,17 @@ content(struct module *mod)
static void static void
find_mount_points(const char *dev_path, mount_point_list_t *mount_points) find_mount_points(const char *dev_path, mount_point_list_t *mount_points)
{ {
FILE *f = fopen("/proc/self/mountinfo", "r"); int fd = open("/proc/self/mountinfo", O_RDONLY | O_CLOEXEC);
assert(f != NULL); FILE *f = fd >= 0 ? fdopen(fd, "r") : NULL;
if (fd < 0 || f == NULL) {
LOG_ERRNO("failed to open /proc/self/mountinfo");
if (fd >= 0)
close(fd);
return;
}
char line[4096]; char line[4096];
while (fgets(line, sizeof(line), f) != NULL) { while (fgets(line, sizeof(line), f) != NULL) {
char *dev = NULL, *path = NULL; char *dev = NULL, *path = NULL;
@ -641,7 +647,7 @@ run(struct module *mod)
/* To be able to poll() mountinfo for changes, to detect /* To be able to poll() mountinfo for changes, to detect
* mount/unmount operations */ * mount/unmount operations */
int mount_info_fd = open("/proc/self/mountinfo", O_RDONLY); int mount_info_fd = open("/proc/self/mountinfo", O_RDONLY | O_CLOEXEC);
int ret = 1; int ret = 1;