Commits

Author Commit Message Labels Comments Date
Stephen Smalley
Merge branch 'master' into seandroid
Branches
seandroid
Nick Kralevich
Merge "VectorImpl.cpp: fix benign multiplication overflow"
Nick Kralevich
VectorImpl.cpp: fix benign multiplication overflow j is a ssize_t, which can go negative. If it goes negative, the resulting multiplication of mItemSize*j doesn't make any sense. Since the value is never used, just don't perform the calculation if j < 0. Bug: 23607865 Change-Id: I14f6f6506645d582f7d67a2e2d60ead3cb18b957
Nick Kralevich
Merge "android_memset.c: Use sanitized shifts"
Yabin Cui
Merge "adb: disconnect: fix write-after-free memory corruption and crash."
Yabin Cui
adb: disconnect: fix write-after-free memory corruption and crash. Transport atransport objects are semi-reference counted: the input and output threads each hold a reference. The adb disconnect command was calling transport_unref to release a reference that it never had in the first place. This meant that the refcount dropped to zero and the object was deleted before either the input or output thread released its reference. When that last thread released its ref…
Duane Sand
android_memset.c: Use sanitized shifts Avoid checks and traps on msb=1 unsigned shifts. Change-Id: I5203a4290296b5557c0420ce0debad3b60d48233
Nick Kralevich
Merge "android_memset.c: Use __attribute__((no_sanitize("integer")))"
Nick Kralevich
android_memset.c: Use __attribute__((no_sanitize("integer"))) Turn off integer sanitization on android_memset. memset()ing is expected to be a fast operation. Avoid the use of the "while (size--) { }" construct, which harmlessly underflows. Change-Id: Ia61ff2323c759bf52df7e70b8be2fae0b0366dda
Yabin Cui
Merge "adb: fix a fake data race on transport:kick reported by tsan."
Bertrand Simonnet
Merge "metricsd: Use system properties to store build time metadata."
Nick Kralevich
Merge "strdup16to8.c: fix benign integer underflow."
Nick Kralevich
strdup16to8.c: fix benign integer underflow. A size_t value is not allowed to go below zero. Change-Id: Ic888c6605d911e0b5dbee1a2fe1daf41e616e106
William Luh
Merge "Add macro to call event logger for errors."
Mark Salyzyn
Merge "logd: klogd and Mediatek"
William Luh
Add macro to call event logger for errors. Bug:23180694 Change-Id: I566a290334345f48013029534efef3e08e726e40
Yabin Cui
adb: fix a fake data race on transport:kick reported by tsan. It is reported by tsan as a double checked locking. But I think it is not a real data race. Because I think the old code is able to make sure t->kick() is only called once, and the caller of kick_transport is not relying on the side-effect of calling t->kick(). But as it is not perf critical, I don't mind breaking the double checked locking pattern. Bug: 23385662 Change-Id: Ie3597dd56bb514117c386…
Yabin Cui
Merge "adb: fix a data race in local_socket_event_func."
Yabin Cui
adb: fix a data race in local_socket_event_func. If s->peer->enqueue() failed, s may be freed. So we should use saved_xxx instead of s->xxx before verifying the return value. Change-Id: I6c072406dceb98e2d02798d0dcdc428fa99e66fb
Mark Salyzyn
logd: klogd and Mediatek - sniff for PID in kernel log messages if available - properly deal with klogd watermark in face of modified output - deal more stringently with priority tag, must have [ following - suppress process-name stutter in tag that can happen - do not use : to demark tag if within [ ] Mediatek-special change that adds <printk_state>(<cpu>)[<pid>:<comm>] as a prefix to the printk messages. Along the line…
Yabin Cui
Merge "adb: keep all asocket operations in the main thread."
Nick Kralevich
Merge "libcutils: enable LOCAL_SANITIZE := integer"
Nick Kralevich
libcutils: enable LOCAL_SANITIZE := integer Call abort() on undefined or sketchy integer behavior. Protects against integer overflow attacks. Tested on Nexus 5 and Nexus 9 with no obvious problems. Change-Id: I6cb28b4a0f5feed69ea472dfac8804fb0bf99719
Nick Kralevich
Merge "libcutils: cleanups for -fsanitize=integer"
Yabin Cui
adb: keep all asocket operations in the main thread. As far as I can see, all asockets operations happen in fdevent_loop() in the main thread, excepting close_all_sockets(). Instead of adding lock and ref_count for each asocket, a simpler way would be moving close_all_sockets() from input_thread to the main thread. In input_thread(), there are two path to break the loop and call close_all_sockets(). One path is when receiving offline A_SYNC, which …
Mark Salyzyn
Merge "logd: worst uid record watermark part deux"
Nick Kralevich
libcutils: cleanups for -fsanitize=integer Hash functions rely on overflow behavior, so whitelist them. ATRACE_TAG_NOT_READY: use an unsigned constant when shifting bits. Otherwise, the value overflows on shift. The users of this constant assign it to a uint64_t variable. Change-Id: I21c437ce2083525e906c3ead3259ec34a1ef4b66
Elliott Hughes
Merge "Don't build 32-bit host libadb."
Elliott Hughes
Don't build 32-bit host libadb. Change-Id: Ib6ad3db2dc160273d20fa14e0820f29ed649d75a
Elliott Hughes
Merge "Fix missing <stdarg.h>."
  1. Prev
  2. Next