diff options
| author | Sherry Yang <sherryy@android.com> | 2017-10-20 20:58:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-21 10:14:20 +0200 |
| commit | ae65c8510f3319dfb2114cc48d476b81232e27b3 (patch) | |
| tree | 3a94ab0f22bdab90c95d824b0d736b294c467233 | |
| parent | a0c2baaf81bd53dc76fccdddc721ba7dbb62be21 (diff) | |
| download | linux-stable-ae65c8510f3319dfb2114cc48d476b81232e27b3.tar.gz linux-stable-ae65c8510f3319dfb2114cc48d476b81232e27b3.tar.bz2 linux-stable-ae65c8510f3319dfb2114cc48d476b81232e27b3.zip | |
android: binder: Fix null ptr dereference in debug msg
Don't access next->data in kernel debug message when the
next buffer is null.
Acked-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Sherry Yang <sherryy@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/android/binder_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index e12072b1d507..c2819a3d58a6 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -560,7 +560,7 @@ static void binder_delete_free_buffer(struct binder_alloc *alloc, binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC, "%d: merge free, buffer %pK do not share page with %pK or %pK\n", alloc->pid, buffer->data, - prev->data, next->data); + prev->data, next ? next->data : NULL); binder_update_page_range(alloc, 0, buffer_start_page(buffer), buffer_start_page(buffer) + PAGE_SIZE, NULL); |