From 0bc6341f8ccc9c38369ebe55503597026411de3f Mon Sep 17 00:00:00 2001 From: Carlos Llamas Date: Tue, 10 Dec 2024 14:31:04 +0000 Subject: [PATCH] BACKPORT: binder: propagate vm_insert_page() errors Instead of always overriding errors with -ENOMEM, propagate the specific error code returned by vm_insert_page(). This allows for more accurate error logs and handling. Cc: Suren Baghdasaryan Reviewed-by: Suren Baghdasaryan Signed-off-by: Carlos Llamas Link: https://lore.kernel.org/r/20241210143114.661252-9-cmllamas@google.com Signed-off-by: Greg Kroah-Hartman Bug: 451083029 Bug: 410746221 (cherry picked from commit 978ce3ed703db86344e1df718ea0f56ec7d4dae1) Change-Id: Ie43287aa091f2a6b05f8f9f1b3aea6e699b88455 [cmllamas: resolved trivial merge conflicts] Signed-off-by: Carlos Llamas --- drivers/android/binder_alloc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index f821127bbe38..cf29ced8782f 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -354,7 +354,6 @@ static int binder_install_single_page(struct binder_alloc *alloc, binder_free_page(page); pr_err("%d: %s failed to insert page at offset %lx with %d\n", alloc->pid, __func__, addr - alloc->buffer, ret); - ret = -ENOMEM; break; } out: