projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a0c2baa
)
android: binder: Fix null ptr dereference in debug msg
author
Sherry Yang
<
[email protected]
>
Sat, 21 Oct 2017 00:58:59 +0000
(20:58 -0400)
committer
Greg Kroah-Hartman
<
[email protected]
>
Sat, 21 Oct 2017 08:14:20 +0000
(10:14 +0200)
Don't access next->data in kernel debug message when the
next buffer is null.
Acked-by: Arve Hjønnevåg <
[email protected]
>
Signed-off-by: Sherry Yang <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/android/binder_alloc.c
patch
|
blob
|
history
diff --git
a/drivers/android/binder_alloc.c
b/drivers/android/binder_alloc.c
index e12072b1d507e8636afa5dffe9811d4471ac0b5c..c2819a3d58a66e63e49cd7e91d3b7caa7a6551a1 100644
(file)
--- 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);