Skip to content

Commit b024d7b

Browse files
committed
perf/core: Prevent VMA split of buffer mappings
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: Add AUX area to ring buffer for raw data streams") Reported-by: [email protected] # ZDI-CAN-27504 Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Lorenzo Stoakes <[email protected]> Acked-by: Arnaldo Carvalho de Melo <[email protected]> Acked-by: Vlastimil Babka <[email protected]> Cc: [email protected]
1 parent f74b9f4 commit b024d7b

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

kernel/events/core.c

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

6845+
static int perf_mmap_may_split(struct vm_area_struct *vma, unsigned long addr)
6846+
{
6847+
/*
6848+
* Forbid splitting perf mappings to prevent refcount leaks due to
6849+
* the resulting non-matching offsets and sizes. See open()/close().
6850+
*/
6851+
return -EINVAL;
6852+
}
6853+
68456854
static const struct vm_operations_struct perf_mmap_vmops = {
68466855
.open = perf_mmap_open,
68476856
.close = perf_mmap_close, /* non mergeable */
68486857
.pfn_mkwrite = perf_mmap_pfn_mkwrite,
6858+
.may_split = perf_mmap_may_split,
68496859
};
68506860

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

0 commit comments

Comments
 (0)