| From e194fd8a5d8e0a7eeed239a8534460724b62fe2d Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com> |
| Date: Mon, 17 Feb 2014 13:58:29 -0800 |
| Subject: staging: binder: Fix death notifications |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= <arve@android.com> |
| |
| commit e194fd8a5d8e0a7eeed239a8534460724b62fe2d upstream. |
| |
| 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. |
| |
| Cc: Colin Cross <ccross@android.com> |
| Cc: Android Kernel Team <kernel-team@android.com> |
| Signed-off-by: Arve Hjønnevåg <arve@android.com> |
| Signed-off-by: John Stultz <john.stultz@linaro.org> |
| Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/staging/android/binder.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/staging/android/binder.c |
| +++ b/drivers/staging/android/binder.c |
| @@ -2904,7 +2904,7 @@ static int binder_node_release(struct bi |
| refs++; |
| |
| if (!ref->death) |
| - goto out; |
| + continue; |
| |
| death++; |
| |
| @@ -2917,7 +2917,6 @@ static int binder_node_release(struct bi |
| BUG(); |
| } |
| |
| -out: |
| binder_debug(BINDER_DEBUG_DEAD_BINDER, |
| "node %d now dead, refs %d, death %d\n", |
| node->debug_id, refs, death); |
