rust_binder: return p from rust_binder_transaction_target_node()

Darksonn · gregkh · commit 4df29fb5bceb · 2026-02-03T13:10:07.000+01:00
Somehow this got changed to NULL when I ported this to upstream it. No idea how that happened. Reported-by: Carlos Llamas <cmllamas@google.com> Closes: https://lore.kernel.org/r/aXkEiC1sGOGfDuzI@google.com Fixes: c1ea312 ("rust_binder: add binder_transaction tracepoint") Signed-off-by: Alice Ryhl <aliceryhl@google.com> Acked-by: Carlos Llamas <cmllamas@google.com> Link: https://patch.msgid.link/20260128-binder-fix-target-node-null-v1-1-78d198ef55a5@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/android/binder/rust_binder.h b/drivers/android/binder/rust_binder.h
@@ -79,7 +79,7 @@ static inline rust_binder_node rust_binder_transaction_target_node(rust_binder_t
 
 	if (p)
 		p = p + RUST_BINDER_LAYOUT.n.arc_offset;
-	return NULL;
+	return p;
 }
 
 static inline rust_binder_process rust_binder_transaction_to_proc(rust_binder_transaction t)

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ static inline rust_binder_node rust_binder_transaction_target_node(rust_binder_t`
`79`	`79`
`80`	`80`	`if (p)`
`81`	`81`	`p = p + RUST_BINDER_LAYOUT.n.arc_offset;`
`82`		`- return NULL;`
	`82`	`+ return p;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`static inline rust_binder_process rust_binder_transaction_to_proc(rust_binder_transaction t)`