Skip to content

Commit 163b0d1

Browse files
KAGA-KOKOgregkh
authored andcommitted
perf/core: Exit early on perf_mmap() fail
commit 07091aa upstream. When perf_mmap() fails to allocate a buffer, it still invokes the event_mapped() callback of the related event. On X86 this might increase the perf_rdpmc_allowed reference counter. But nothing undoes this as perf_mmap_close() is never called in this case, which causes another reference count leak. Return early on failure to prevent that. Fixes: 1e0fb9e ("perf/core: Add pmu callbacks to track event mapping and unmapping") Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e091cc1 commit 163b0d1

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

kernel/events/core.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7075,15 +7075,17 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
70757075
mutex_unlock(aux_mutex);
70767076
mutex_unlock(&event->mmap_mutex);
70777077

7078+
if (ret)
7079+
return ret;
7080+
70787081
/*
70797082
* Since pinned accounting is per vm we cannot allow fork() to copy our
70807083
* vma.
70817084
*/
70827085
vm_flags_set(vma, VM_DONTCOPY | VM_DONTEXPAND | VM_DONTDUMP);
70837086
vma->vm_ops = &perf_mmap_vmops;
70847087

7085-
if (!ret)
7086-
ret = map_range(rb, vma);
7088+
ret = map_range(rb, vma);
70877089

70887090
if (!ret && event->pmu->event_mapped)
70897091
event->pmu->event_mapped(event, vma->vm_mm);

0 commit comments

Comments
 (0)