From: Arve Hjønnevåg <arve@android.com>
Date: Sat, 8 Feb 2014 01:46:21 +0000 (-0800)
Subject: Staging: android: binder: Fix death notifications
X-Git-Tag: firefly_0821_release~4090^2~378
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fd3a17735623a882bc6afd590e9c9bfb0e770f80;p=firefly-linux-kernel-4.4.55.git

Staging: android: binder: Fix death notifications

The change (008fa749e0fe5b2fffd20b7fe4891bb80d072c6a) that moved the
node release code to a separate function broke death notifications in
some cases. When it encountered a reference without a death
notification request, it would skip looking at the remaining
references, and therefore fail to send death notifications for them.

Change-Id: I12083a50709ccc30ba11a5f4d9eeb5f0ff4471c6
Signed-off-by: Arve Hjønnevåg <arve@android.com>
---

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index a1931c026230..6aec8509d7b0 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -2941,7 +2941,7 @@ static int binder_node_release(struct binder_node *node, int refs)
 		refs++;
 
 		if (!ref->death)
-			goto out;
+			continue;
 
 		death++;
 
@@ -2954,7 +2954,6 @@ static int binder_node_release(struct binder_node *node, int refs)
 			BUG();
 	}
 
-out:
 	binder_debug(BINDER_DEBUG_DEAD_BINDER,
 		     "node %d now dead, refs %d, death %d\n",
 		     node->debug_id, refs, death);