Skip to content

Commit ff66893

Browse files
KAGA-KOKOgregkh
authored andcommitted
perf/core: Prevent VMA split of buffer mappings
commit b024d7b upstream. The perf mmap code is careful about mmap()'ing the user page with the ringbuffer and additionally the auxiliary buffer, when the event supports it. Once the first mapping is established, subsequent mapping have to use the same offset and the same size in both cases. The reference counting for the ringbuffer and the auxiliary buffer depends on this being correct. Though perf does not prevent that a related mapping is split via mmap(2), munmap(2) or mremap(2). A split of a VMA results in perf_mmap_open() calls, which take reference counts, but then the subsequent perf_mmap_close() calls are not longer fulfilling the offset and size checks. This leads to reference count leaks. As perf already has the requirement for subsequent mappings to match the initial mapping, the obvious consequence is that VMA splits, caused by resizing of a mapping or partial unmapping, have to be prevented. Implement the vm_operations_struct::may_split() callback and return unconditionally -EINVAL. That ensures that the mapping offsets and sizes cannot be changed after the fact. Remapping to a different fixed address with the same size is still possible as it takes the references for the new mapping and drops those of the old mapping. Fixes: 45bfb2e ("perf/core: Add AUX area to ring buffer for raw data streams") Reported-by: zdi-disclosures@trendmicro.com # ZDI-CAN-27504 Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 831e1c9 commit ff66893

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

kernel/events/core.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6790,10 +6790,20 @@ static vm_fault_t perf_mmap_pfn_mkwrite(struct vm_fault *vmf)
67906790
return vmf->pgoff == 0 ? 0 : VM_FAULT_SIGBUS;
67916791
}
67926792

6793+
static int perf_mmap_may_split(struct vm_area_struct *vma, unsigned long addr)
6794+
{
6795+
/*
6796+
* Forbid splitting perf mappings to prevent refcount leaks due to
6797+
* the resulting non-matching offsets and sizes. See open()/close().
6798+
*/
6799+
return -EINVAL;
6800+
}
6801+
67936802
static const struct vm_operations_struct perf_mmap_vmops = {
67946803
.open = perf_mmap_open,
67956804
.close = perf_mmap_close, /* non mergeable */
67966805
.pfn_mkwrite = perf_mmap_pfn_mkwrite,
6806+
.may_split = perf_mmap_may_split,
67976807
};
67986808

67996809
static int map_range(struct perf_buffer *rb, struct vm_area_struct *vma)

0 commit comments

Comments
 (0)