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:
36f3093
)
binder: fix handling of misaligned binder object
author
Todd Kjos
<
[email protected]
>
Thu, 14 Feb 2019 23:22:57 +0000
(15:22 -0800)
committer
Greg Kroah-Hartman
<
[email protected]
>
Fri, 15 Feb 2019 07:49:20 +0000
(08:49 +0100)
Fixes crash found by syzbot:
kernel BUG at drivers/android/binder_alloc.c:LINE! (2)
Reported-and-tested-by:
[email protected]
Signed-off-by: Todd Kjos <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/android/binder.c
patch
|
blob
|
history
diff --git
a/drivers/android/binder.c
b/drivers/android/binder.c
index 2dba539eb792cebc57b9632946d4d397ae78e99d..8685882da64cdaf60dcbac09d9c61735905b5300 100644
(file)
--- a/
drivers/android/binder.c
+++ b/
drivers/android/binder.c
@@
-2057,7
+2057,7
@@
static size_t binder_get_object(struct binder_proc *proc,
size_t object_size = 0;
read_size = min_t(size_t, sizeof(*object), buffer->data_size - offset);
- if (read_size < sizeof(*hdr))
+ if (read_size < sizeof(*hdr)
|| !IS_ALIGNED(offset, sizeof(u32))
)
return 0;
binder_alloc_copy_from_buffer(&proc->alloc, object, buffer,
offset, read_size);