diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2022-03-27 13:10:26 +0200 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2022-03-29 15:35:38 +0200 |
| commit | 62c3edd9575cb7dfef0d86392e4b87a4c14d8dee (patch) | |
| tree | a81a324ef38fdbb62c42f25dfa6cfdaec41480c0 /passt.c | |
| parent | ad7f57a5b75ae62b48e5ff4f0c302f545dea2603 (diff) | |
| download | passt-62c3edd9575cb7dfef0d86392e4b87a4c14d8dee.tar passt-62c3edd9575cb7dfef0d86392e4b87a4c14d8dee.tar.gz passt-62c3edd9575cb7dfef0d86392e4b87a4c14d8dee.tar.bz2 passt-62c3edd9575cb7dfef0d86392e4b87a4c14d8dee.tar.lz passt-62c3edd9575cb7dfef0d86392e4b87a4c14d8dee.tar.xz passt-62c3edd9575cb7dfef0d86392e4b87a4c14d8dee.tar.zst passt-62c3edd9575cb7dfef0d86392e4b87a4c14d8dee.zip | |
treewide: Fix android-cloexec-* clang-tidy warnings, re-enable checks
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'passt.c')
| -rw-r--r-- | passt.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -202,7 +202,7 @@ static void check_root(void) if (getuid() && geteuid()) return; - if ((fd = open("/proc/self/uid_map", O_RDONLY)) < 0) + if ((fd = open("/proc/self/uid_map", O_RDONLY | O_CLOEXEC)) < 0) return; if (read(fd, buf, BUFSIZ) > 0 && @@ -359,7 +359,7 @@ int main(int argc, char **argv) if (!c.debug && (c.stderr || isatty(fileno(stdout)))) __openlog(log_name, LOG_PERROR, LOG_DAEMON); - c.epollfd = epoll_create1(0); + c.epollfd = epoll_create1(c.foreground ? O_CLOEXEC : 0); if (c.epollfd == -1) { perror("epoll_create1"); exit(EXIT_FAILURE); @@ -405,11 +405,12 @@ int main(int argc, char **argv) pcap_init(&c); if (!c.foreground) + /* NOLINTNEXTLINE(android-cloexec-open): see __daemon() */ devnull_fd = open("/dev/null", O_RDWR); if (*c.pid_file) - pidfile_fd = open(c.pid_file, - O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR); + pidfile_fd = open(c.pid_file, O_CREAT | O_WRONLY | O_CLOEXEC, + S_IRUSR | S_IWUSR); if (sandbox(&c)) { err("Failed to sandbox process, exiting\n"); |