[PATCH 4.14] perf/core: Avoid put_page() when GUP fails

[PATCH 4.14] perf/core: Avoid put_page() when GUP fails

[Greg Thelen]

commit 4716023a8f6a0f4a28047f14dd7ebdc319606b84 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: fc7ce9c74c3ad ("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
[gthelen: manual backport to 4.14]
---
 kernel/events/core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 236e7900e3fc..0736508d595b 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6110,7 +6110,6 @@ void perf_output_sample(struct perf_output_handle *handle,
 static u64 perf_virt_to_phys(u64 virt)
 {
 	u64 phys_addr = 0;
-	struct page *p = NULL;
 
 	if (!virt)
 		return 0;
@@ -6129,14 +6128,15 @@ static u64 perf_virt_to_phys(u64 virt)
 		 * If failed, leave phys_addr as 0.
 		 */
 		if (current->mm != NULL) {
+			struct page *p;
+
 			pagefault_disable();
-			if (__get_user_pages_fast(virt, 1, 0, &p) == 1)
+			if (__get_user_pages_fast(virt, 1, 0, &p) == 1) {
 				phys_addr = page_to_phys(p) + virt % PAGE_SIZE;
+				put_page(p);
+			}
 			pagefault_enable();
 		}
-
-		if (p)
-			put_page(p);
 	}
 
 	return phys_addr;
-- 
2.34.0.rc2.393.gf8c9666880-goog

Re: [PATCH 4.14] perf/core: Avoid put_page() when GUP fails

[Greg KH]

On Mon, Nov 22, 2021 at 09:18:25AM -0800, Greg Thelen wrote:
> commit 4716023a8f6a0f4a28047f14dd7ebdc319606b84 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: fc7ce9c74c3ad ("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
> [gthelen: manual backport to 4.14]
> ---
>  kernel/events/core.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

All now queued up,t hanks.

greg k-h