diff options
| author | Sherry Yang <sherryy@android.com> | 2017-10-05 17:13:47 -0400 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2017-10-23 19:10:08 +0000 |
| commit | a7e1d33c7a1101936cf7f048a0ef7cac62e32cd0 (patch) | |
| tree | a5f5d012fd638d97c34dc75b9a9754b7a45b49b4 | |
| parent | c9391ba6ee7930ccfda71748cec2d8d210510cc8 (diff) | |
FROMLIST: android: binder: Fix null ptr dereference in debug msg
(from https://patchwork.kernel.org/patch/9990323/)
Don't access next->data in kernel debug message when the
next buffer is null.
Bug: 36007193
Change-Id: Ib8240d7e9a7087a2256e88c0ae84b9df0f2d0224
Acked-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Sherry Yang <sherryy@android.com>
| -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 22cb64f8d96c..e431cfcfb59b 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -561,7 +561,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); } |