|
@@ -119,7 +119,8 @@ static int cpu_function_call(int cpu, int (*func) (void *info), void *info)
|
|
|
|
|
|
#define PERF_FLAG_ALL (PERF_FLAG_FD_NO_GROUP |\
|
|
|
PERF_FLAG_FD_OUTPUT |\
|
|
|
- PERF_FLAG_PID_CGROUP)
|
|
|
+ PERF_FLAG_PID_CGROUP |\
|
|
|
+ PERF_FLAG_FD_CLOEXEC)
|
|
|
|
|
|
/*
|
|
|
* branch priv levels that need permission checks
|
|
@@ -6982,6 +6983,7 @@ SYSCALL_DEFINE5(perf_event_open,
|
|
|
int event_fd;
|
|
|
int move_group = 0;
|
|
|
int err;
|
|
|
+ int f_flags = O_RDWR;
|
|
|
|
|
|
/* for future expandability... */
|
|
|
if (flags & ~PERF_FLAG_ALL)
|
|
@@ -7010,7 +7012,10 @@ SYSCALL_DEFINE5(perf_event_open,
|
|
|
if ((flags & PERF_FLAG_PID_CGROUP) && (pid == -1 || cpu == -1))
|
|
|
return -EINVAL;
|
|
|
|
|
|
- event_fd = get_unused_fd();
|
|
|
+ if (flags & PERF_FLAG_FD_CLOEXEC)
|
|
|
+ f_flags |= O_CLOEXEC;
|
|
|
+
|
|
|
+ event_fd = get_unused_fd_flags(f_flags);
|
|
|
if (event_fd < 0)
|
|
|
return event_fd;
|
|
|
|
|
@@ -7132,7 +7137,8 @@ SYSCALL_DEFINE5(perf_event_open,
|
|
|
goto err_context;
|
|
|
}
|
|
|
|
|
|
- event_file = anon_inode_getfile("[perf_event]", &perf_fops, event, O_RDWR);
|
|
|
+ event_file = anon_inode_getfile("[perf_event]", &perf_fops, event,
|
|
|
+ f_flags);
|
|
|
if (IS_ERR(event_file)) {
|
|
|
err = PTR_ERR(event_file);
|
|
|
goto err_context;
|