diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-02-04 10:45:42 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-02-04 10:45:42 +0300 |
| commit | 98cb621081705e2244ef6c265ff8a9f2208c7e2a (patch) | |
| tree | 6205be47a83d54d3e35e049b67973244120f8bd6 /kernel/events/ring_buffer.c | |
| parent | b844ff366f06a2bcecfbd053b4d4a472e670dec8 (diff) | |
| parent | 9dff0aa95a324e262ffb03f425d00e4751f3294e (diff) | |
| download | linux-98cb621081705e2244ef6c265ff8a9f2208c7e2a.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/ring_buffer.c')
| -rw-r--r-- | kernel/events/ring_buffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index 4a9937076331..309ef5a64af5 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -734,6 +734,9 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) size = sizeof(struct ring_buffer); size += nr_pages * sizeof(void *); + if (order_base_2(size) >= MAX_ORDER) + goto fail; + rb = kzalloc(size, GFP_KERNEL); if (!rb) goto fail; |