From dee1ef48a97e5412b3bd1d7e5a3e2b81f3741dc4 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Wed, 16 Dec 2015 12:32:26 -0800 Subject: [PATCH] trace-dev.c: more O_CLOEXEC Stop the file descriptors from leaking. Change-Id: Ib5ca1c2e5031fbec8751bde9e86b32e51e10fcbc --- libcutils/trace-dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcutils/trace-dev.c b/libcutils/trace-dev.c index a06987ec0..f025256f1 100644 --- a/libcutils/trace-dev.c +++ b/libcutils/trace-dev.c @@ -104,7 +104,7 @@ static bool atrace_is_app_tracing_enabled() if (sys_debuggable || atrace_is_debuggable) { // Check whether tracing is enabled for this process. - FILE * file = fopen("/proc/self/cmdline", "r"); + FILE * file = fopen("/proc/self/cmdline", "re"); if (file) { char cmdline[4096]; if (fgets(cmdline, sizeof(cmdline), file)) { @@ -173,7 +173,7 @@ void atrace_update_tags() static void atrace_init_once() { - atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY); + atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY | O_CLOEXEC); if (atrace_marker_fd == -1) { ALOGE("Error opening trace file: %s (%d)", strerror(errno), errno); atrace_enabled_tags = 0;