diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-06 07:30:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-06 07:30:22 +0100 |
| commit | 8af31363cda93724c237b6ffb24380f4441d2f8d (patch) | |
| tree | dc25d9ff94761b0adc9381aebd06c8e7f77884e3 /kernel/trace | |
| parent | ddc4becca1409541c2ebb7ecb99b5cef44cf17e4 (diff) | |
| parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) | |
| download | lwn-8af31363cda93724c237b6ffb24380f4441d2f8d.tar.gz lwn-8af31363cda93724c237b6ffb24380f4441d2f8d.zip | |
Merge tag 'v4.16-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index fc2838ac8b78..c0a9e310d715 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -872,6 +872,8 @@ int perf_event_query_prog_array(struct perf_event *event, void __user *info) return -EINVAL; if (copy_from_user(&query, uquery, sizeof(query))) return -EFAULT; + if (query.ids_len > BPF_TRACE_MAX_PROGS) + return -E2BIG; mutex_lock(&bpf_event_mutex); ret = bpf_prog_array_copy_info(event->tp_event->prog_array, |