shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

everywhere: always use O_CLOEXEC where it makes sense

Browse Source
This commit is contained in:
Lennart Poettering 2014-02-13 14:59:56 +01:00
parent 955d98c9c1
commit c8a202b7d4
14 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bootchart/bootchart.c
View File

@ -259,7 +259,7 @@ static void do_journal_append(char *file) {
memcpy(p, "BOOTCHART=", 10);
f = open(file, O_RDONLY);
f = open(file, O_RDONLY|O_CLOEXEC);
if (f < 0) {
log_error("Failed to read bootchart data: %m");
return;
@ -356,11 +356,11 @@ int main(int argc, char *argv[]) {
t = time(NULL);
strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
of = fopen(output_file, "w");
of = fopen(output_file, "we");
}
if (sysfd < 0)
sysfd = open("/sys", O_RDONLY);
sysfd = open("/sys", O_RDONLY|O_CLOEXEC);
if (!build)
parse_env_file("/etc/os-release", NEWLINE,
@ -424,7 +424,7 @@ int main(int argc, char *argv[]) {
t = time(NULL);
strftime(datestr, sizeof(datestr), "%Y%m%d-%H%M", localtime(&t));
snprintf(output_file, PATH_MAX, "%s/bootchart-%s.svg", arg_output_path, datestr);
of = fopen(output_file, "w");
of = fopen(output_file, "we");
}
if (!of) {

2
src/bootchart/store.c
View File

@ -61,7 +61,7 @@ void log_uptime(void) {
char str[32];
double uptime;
f = fopen("/proc/uptime", "r");
f = fopen("/proc/uptime", "re");
if (!f)
return;

2
src/fsck/fsck.c
View File

@ -155,7 +155,7 @@ static int process_progress(int fd) {
return -errno;
}
console = fopen("/dev/console", "w");
console = fopen("/dev/console", "we");
if (!console)
return -ENOMEM;

2
src/shared/fileio.c
View File

@ -130,7 +130,7 @@ ssize_t sendfile_full(int out_fd, const char *fn) {
assert(out_fd > 0);
assert(fn);
f = fopen(fn, "r");
f = fopen(fn, "re");
if (!f)
return -errno;

2
src/shared/sleep-config.c
View File

@ -174,7 +174,7 @@ static int hibernation_partition_size(size_t *size, size_t *used) {
assert(size);
assert(used);
f = fopen("/proc/swaps", "r");
f = fopen("/proc/swaps", "re");
if (!f) {
log_full(errno == ENOENT ? LOG_DEBUG : LOG_WARNING,
"Failed to retrieve open /proc/swaps: %m");

2
src/udev/accelerometer/accelerometer.c
View File

@ -197,7 +197,7 @@ static void test_orientation(struct udev *udev,
old = get_prev_orientation(dev);
fd = open(devpath, O_RDONLY);
fd = open(devpath, O_RDONLY|O_CLOEXEC);
if (fd < 0)
return;

2
src/udev/ata_id/ata_id.c
View File

@ -468,7 +468,7 @@ int main(int argc, char *argv[])
goto exit;
}
fd = open(node, O_RDONLY|O_NONBLOCK);
fd = open(node, O_RDONLY|O_NONBLOCK|O_CLOEXEC);
if (fd < 0) {
log_error("unable to open '%s'", node);
rc = 1;

2
src/udev/cdrom_id/cdrom_id.c
View File

@ -930,7 +930,7 @@ int main(int argc, char *argv[])
for (cnt = 20; cnt > 0; cnt--) {
struct timespec duration;
fd = open(node, O_RDONLY|O_NONBLOCK|(is_mounted(node) ? 0 : O_EXCL));
fd = open(node, O_RDONLY|O_NONBLOCK|O_CLOEXEC|(is_mounted(node) ? 0 : O_EXCL));
if (fd >= 0 || errno != EBUSY)
break;
duration.tv_sec = 0;

2
src/udev/collect/collect.c
View File

@ -95,7 +95,7 @@ static int prepare(char *dir, char *filename)
snprintf(buf, sizeof(buf), "%s/%s", dir, filename);
fd = open(buf,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
fd = open(buf,O_RDWR|O_CREAT|O_CLOEXEC, S_IRUSR|S_IWUSR);
if (fd < 0)
fprintf(stderr, "Cannot open %s: %m\n", buf);

2
src/udev/mtd_probe/mtd_probe.c
View File

@ -37,7 +37,7 @@ int main(int argc, char** argv)
return 1;
}
mtd_fd = open(argv[1], O_RDONLY);
mtd_fd = open(argv[1], O_RDONLY|O_CLOEXEC);
if (mtd_fd == -1) {
perror("open");
exit(-1);

4
src/udev/scsi_id/scsi_serial.c
View File

@ -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;

5
src/udev/udev-builtin-btrfs.c
View File

@ -38,19 +38,18 @@ struct btrfs_ioctl_vol_args {
static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool test)
{
struct btrfs_ioctl_vol_args args;
int fd;
_cleanup_close_ int fd = -1;
int err;
if (argc != 3 || !streq(argv[1], "ready"))
return EXIT_FAILURE;
fd = open("/dev/btrfs-control", O_RDWR);
fd = open("/dev/btrfs-control", O_RDWR|O_CLOEXEC);
if (fd < 0)
return EXIT_FAILURE;
strscpy(args.name, sizeof(args.name), argv[2]);
err = ioctl(fd, BTRFS_IOC_DEVICES_READY, &args);
close(fd);
if (err < 0)
return EXIT_FAILURE;

2
src/udev/udevadm-trigger.c
View File

@ -51,7 +51,7 @@ static void exec_list(struct udev_enumerate *udev_enumerate, const char *action)
if (dry_run)
continue;
strscpyl(filename, sizeof(filename), udev_list_entry_get_name(entry), "/uevent", NULL);
fd = open(filename, O_WRONLY);
fd = open(filename, O_WRONLY|O_CLOEXEC);
if (fd < 0)
continue;
if (write(fd, action, strlen(action)) < 0)

2
src/udev/udevd.c
View File

@ -734,7 +734,7 @@ static int handle_inotify(struct udev *udev)
log_debug("device %s closed, synthesising 'change'", udev_device_get_devnode(dev));
strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL);
fd = open(filename, O_WRONLY);
fd = open(filename, O_WRONLY|O_CLOEXEC);
if (fd >= 0) {
if (write(fd, "change", 6) < 0)
log_debug("error writing uevent: %m");