From: Adrian Hunter Date: Mon, 24 Jun 2024 20:11:01 +0000 (+0300) Subject: perf: Make rb_alloc_aux() return an error immediately if nr_pages <= 0 X-Git-Tag: v6.11-rc1~168^2~29 X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=0ca4da2412da05fb9dd0b5d90dcc8026219f0f29;p=linux%2F.git perf: Make rb_alloc_aux() return an error immediately if nr_pages <= 0 rb_alloc_aux() should not be called with nr_pages <= 0. Make it more robust and readable by returning an error immediately in that case. Signed-off-by: Adrian Hunter Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20240624201101.60186-8-adrian.hunter@intel.com --- diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index 485cf0a66631..8cadf97bc290 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -682,6 +682,9 @@ int rb_alloc_aux(struct perf_buffer *rb, struct perf_event *event, if (!has_aux(event)) return -EOPNOTSUPP; + if (nr_pages <= 0) + return -EINVAL; + if (!overwrite) { /* * Watermark defaults to half the buffer, and so does the