perf/core: Avoid put_page() when GUP fails
commit4716023a8f
upstream. PEBS PERF_SAMPLE_PHYS_ADDR events use perf_virt_to_phys() to convert PMU sampled virtual addresses to physical using get_user_page_fast_only() and page_to_phys(). Some get_user_page_fast_only() error cases return false, indicating no page reference, but still initialize the output page pointer with an unreferenced page. In these error cases perf_virt_to_phys() calls put_page(). This causes page reference count underflow, which can lead to unintentional page sharing. Fix perf_virt_to_phys() to only put_page() if get_user_page_fast_only() returns a referenced page. Fixes:fc7ce9c74c
("perf/core, x86: Add PERF_SAMPLE_PHYS_ADDR") Signed-off-by: Greg Thelen <gthelen@google.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20211111021814.757086-1-gthelen@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
7931b7e318
Коммит
bd378dcd50
|
@ -7154,7 +7154,6 @@ void perf_output_sample(struct perf_output_handle *handle,
|
||||||
static u64 perf_virt_to_phys(u64 virt)
|
static u64 perf_virt_to_phys(u64 virt)
|
||||||
{
|
{
|
||||||
u64 phys_addr = 0;
|
u64 phys_addr = 0;
|
||||||
struct page *p = NULL;
|
|
||||||
|
|
||||||
if (!virt)
|
if (!virt)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -7173,14 +7172,15 @@ static u64 perf_virt_to_phys(u64 virt)
|
||||||
* If failed, leave phys_addr as 0.
|
* If failed, leave phys_addr as 0.
|
||||||
*/
|
*/
|
||||||
if (current->mm != NULL) {
|
if (current->mm != NULL) {
|
||||||
|
struct page *p;
|
||||||
|
|
||||||
pagefault_disable();
|
pagefault_disable();
|
||||||
if (get_user_page_fast_only(virt, 0, &p))
|
if (get_user_page_fast_only(virt, 0, &p)) {
|
||||||
phys_addr = page_to_phys(p) + virt % PAGE_SIZE;
|
phys_addr = page_to_phys(p) + virt % PAGE_SIZE;
|
||||||
|
put_page(p);
|
||||||
|
}
|
||||||
pagefault_enable();
|
pagefault_enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p)
|
|
||||||
put_page(p);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return phys_addr;
|
return phys_addr;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче