Commit graph

10285 commits

Author SHA1 Message Date
Sergio Giro
b022447a3a DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.

Correcting the length computation and adding bound checks to the
conversion functions.

(cherry picked from commit c4966a363e)

Change-Id: Idfb0eb29b305678608586d25c2f372146569ad39
Bug: 29250543
2016-07-14 14:47:59 +00:00
Josh Gao
45a4bca09d DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999
am: a3d96cfec9  -s ours

Change-Id: I4ca0f2890519c3450a15edab989ca424b6bb10ae
2016-06-22 18:07:24 +00:00
Josh Gao
a3d96cfec9 DO NOT MERGE: adb: use asocket\\'s close function when closing. am: 5218ad36ad
am: d7e24ec999

Change-Id: I9ca9e7e857de9e9679169cd7239f9e54a3d98dd2
2016-06-22 18:02:25 +00:00
Josh Gao
d7e24ec999 DO NOT MERGE: adb: use asocket\'s close function when closing.
am: 5218ad36ad

Change-Id: Ibc9ee3b566d34847f4e1e02413890449750ba2f5
2016-06-22 17:59:18 +00:00
Josh Gao
83cb3032d2 DO NOT MERGE: adb: use asocket's close function when closing.
close_all_sockets was assuming that all registered local sockets used
local_socket_close as their close function. However, this is not true
for JDWP sockets.

Backport of 53eb31d8 and 9b587de.

Bug: http://b/28347842
Change-Id: I05e071b3d5c7e55c7a59400c5c9bb0635eeef29f
2016-06-21 16:28:29 -07:00
Josh Gao
5218ad36ad DO NOT MERGE: adb: use asocket's close function when closing.
close_all_sockets was assuming that all registered local sockets used
local_socket_close as their close function. However, this is not true
for JDWP sockets.

Backport of 53eb31d8 and 9b587de.

Bug: http://b/28347842
Change-Id: I13ec6fd87a0691c72608baf6038adcc0f03dca9f
2016-06-21 16:28:21 -07:00
Elliott Hughes
de529e72b6 resolve merge conflicts of 7f5da85 to lmp-dev
Change-Id: I7a7547426a229ac99d187ec8bfabd49c4da51907
2016-05-24 15:23:48 -07:00
Elliott Hughes
7f5da85015 Fix scanf %s in lsof. am: 008efb756f
am: 491dfb11b7

* commit '491dfb11b762f44dc9848496d5d30514082aab64':
  Fix scanf %s in lsof.

Change-Id: Ife17fa56f125dfec08d0d4b0c5c368bdae51106e
2016-05-24 22:13:03 +00:00
Elliott Hughes
491dfb11b7 Fix scanf %s in lsof.
am: 008efb756f

* commit '008efb756fea8a9e66a1825b546e9dc392c72bec':
  Fix scanf %s in lsof.

Change-Id: I608ae2094649617308b45571df1b649724ec8ac3
2016-05-24 22:10:19 +00:00
Elliott Hughes
008efb756f Fix scanf %s in lsof.
Bug: http://b/28175237
Change-Id: Ief0ba299b09693ad9afc0e3d17a8f664c2fbb8c2
2016-04-19 14:57:09 -07:00
Daniel Rosenberg
ad431d2e2e Fix overflow in path building am: 6ea6c04 am: 9c44027
am: 4830087

* commit '4830087b3755b4c3498880369ccbe918aa136cd0':
  Fix overflow in path building

Change-Id: Ie2044be5b1c31b1fe128c90eda1c5df169dc0a3d
2016-04-14 19:34:33 +00:00
Daniel Rosenberg
4830087b37 Fix overflow in path building am: 6ea6c04
am: 9c44027

* commit '9c440272192d600c72659da5bfbe0c2e0a133cfe':
  Fix overflow in path building

Change-Id: Idb39dfc88adb854ffbc3bd40be0d28409248fc85
2016-04-14 19:31:17 +00:00
Daniel Rosenberg
9c44027219 Fix overflow in path building
am: 6ea6c04

* commit '6ea6c04ca695e0f0b6bcf3ea4529b9fd74fee8e4':
  Fix overflow in path building

Change-Id: Ia4388b694ddb12083e0d5a67a3a5f3f5bba2fb12
2016-04-14 19:27:58 +00:00
Daniel Rosenberg
6ea6c04ca6 Fix overflow in path building
An incorrect size was causing an unsigned value
to wrap, causing it to write past the end of
the buffer.

Bug: 28085658
Change-Id: Ie9625c729cca024d514ba2880ff97209d435a165
2016-04-13 00:11:52 +00:00
Josh Gao
69147994ba Merge "Don't demangle symbol names." into lmp-dev 2016-03-23 18:13:20 +00:00
Josh Gao
ba1f9d50bd Don\'t demangle symbol names. DO NOT MERGE am: a183654 -s ours
am: 908c511  -s ours

* commit '908c511e50c2ed5f69dcafbe82af75d5a090275f':
  Don't demangle symbol names. DO NOT MERGE
2016-03-23 00:53:20 +00:00
Josh Gao
908c511e50 Don\'t demangle symbol names. DO NOT MERGE
am: a183654  -s ours

* commit 'a183654b820447e6bd9980413e1f7ff5b89f875b':
  Don't demangle symbol names. DO NOT MERGE
2016-03-23 00:49:48 +00:00
Josh Gao
7c903fbacf Don't demangle symbol names.
Bug: http://b/27299236
Change-Id: I3a698c6d93e262fd78e743c1e6e946b054b9dcd1
2016-03-22 11:51:36 -07:00
Josh Gao
a183654b82 Don't demangle symbol names. DO NOT MERGE
Bug: http://b/27299236
Change-Id: I80524d8d5df9c5abea8c6db8ded965a5dfa3d607
2016-03-22 11:33:28 -07:00
Josh Gao
1eb6ec56c2 resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE
am: bdfb431467  -s ours

* commit 'bdfb43146770f631c7097c378c0dbb8e6f8619a1':
  Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:30:37 +00:00
Josh Gao
adc3bcb1d5 resolve merge conflicts of 9515c23e16 to klp-modular-dev
am: 91b48c3796  -s ours

* commit '91b48c37962238e3568d6660aeadfcd4d6eb4207':
  debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:23:55 +00:00
Josh Gao
bdfb431467 resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE
Change-Id: I51653e2ba8e7d1fa345206a4dd8b15f2e29429f2
2016-02-24 13:20:48 -08:00
Josh Gao
91b48c3796 resolve merge conflicts of 9515c23e16 to klp-modular-dev
Change-Id: I4b39875ce57bb1ea55898db3ffc004a491bbeaa4
2016-02-24 12:08:28 -08:00
Nick Kralevich
d61ebb0851 ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20  -s ours

* commit 'c61a896f2006d76fd3d805ace2282b9590432a67':
  ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:18:41 +00:00
Nick Kralevich
c61a896f20 ensure /data/tombstones exists on all Android device. DO NOT MERGE
am: 9c0ed66313

* commit '9c0ed663138138bb40396bfd350f137e5057277b':
  ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:11:38 +00:00
Josh Gao
cb9625cbe5 Don't create tombstone directory.
Partial backport of cf79748.

Bug: http://b/26403620
Change-Id: Ib877ab6cfab6aef079830c5a50ba81141ead35ee
2016-02-16 15:09:46 -08:00
Nick Kralevich
e2796207ee ensure /data/tombstones exists on all Android devices
/data/tombstones is referenced by core platform code, but is not
guaranteed to exist on all Android devices. Move the directory
creation out of device specific files and into the core
init.rc file.

Bug: https://code.google.com/p/android/issues/detail?id=93207
Change-Id: I94ae5199a6a32c4fe555ca994fc4a8345e0c9690

Bug: http://b/26403620
(cherry picked from commit 0359d778a5)
2016-02-16 15:09:43 -08:00
Josh Gao
557749e55b Don't create tombstone directory. DO NOT MERGE
Partial backport of cf79748.

Bug: http://b/26403620
Change-Id: I412889bfa331c96ad8e2ce6e0d66b54fb230e8c0
2016-02-16 15:07:35 -08:00
Josh Gao
9515c23e16 debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
Effectively a cherry-pick of 04f9b2a.

Bug: http://b/26403620
Change-Id: I0437fdc774501f428d8b4f8dd7682b32eaa29cef
2016-02-16 15:07:35 -08:00
Nick Kralevich
9c0ed66313 ensure /data/tombstones exists on all Android device. DO NOT MERGE
/data/tombstones is referenced by core platform code, but is not
guaranteed to exist on all Android devices. Move the directory
creation out of device specific files and into the core
init.rc file.

Bug: https://code.google.com/p/android/issues/detail?id=93207
Change-Id: I94ae5199a6a32c4fe555ca994fc4a8345e0c9690

Bug: http://b/26403620
(cherry picked from commit 0359d778a5)
2016-02-16 15:07:29 -08:00
Jon Larimer
362f13d74a Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158
am: fd56dc41c7  -s ours

* commit 'fd56dc41c70a58541b9ed25f4c97ffe3fea19536':
  Add macro to call event logger for errors. DO NOT MERGE
2015-11-11 13:55:57 +00:00
Jon Larimer
fd56dc41c7 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev
am: 809d5a0158

* commit '809d5a01586d00ee91d13fb8d034d12584ba3314':
  Add macro to call event logger for errors. DO NOT MERGE
2015-11-11 13:50:40 +00:00
Jon Larimer
5280061b56 Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev 2015-11-11 13:42:35 +00:00
Jon Larimer
809d5a0158 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev 2015-11-11 13:42:33 +00:00
William Luh
f34258fa9b Add macro to call event logger for errors. DO NOT MERGE
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:32 +00:00
William Luh
4fd82100cc Add macro to call event logger for errors. DO NOT MERGE
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:10 +00:00
Narayan Kamath
0cc468dc2a am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit 'fef9dffd96e8bc6f2283a57cd0b29df4be43eb46':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-12 08:49:20 +00:00
Narayan Kamath
2e64e9590a am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit 'a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-12 08:49:15 +00:00
Narayan Kamath
fef9dffd96 am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit '6c53de92cf7e759488538280788325fac6ccdea2':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-11 09:50:09 +00:00
Narayan Kamath
a82d6dc3bf resolved conflicts for b638126e to klp-modular-dev
Change-Id: If5062b01afa95279ab25fe86aaafa89d4d74eaa1
2015-09-10 22:00:26 +01:00
Narayan Kamath
6c53de92cf Follow up to change b638126ed DO NOT MERGE.
Resolves delta between the kitkat and L version of this patch.
Fixes the molly build on klp-dev.

bug: 22953624
Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36
2015-09-10 20:30:59 +00:00
Narayan Kamath
419e6c3c68 libutils: Fix integer overflows in VectorImpl.
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

(cherry picked from commit c609c31fb5)

Change-Id: I61644633db6b54fa230683615de9724f7fabf6fb
2015-09-09 12:05:06 +01:00
Narayan Kamath
b638126ed3 libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

(cherry picked from commit c609c31fb5)

Change-Id: I673b7ab142bed4fcba9159a00a65cf6bca6b1f6c
2015-09-09 11:20:13 +01:00
Sergio Giro
0cc9a6e6e1 libutils: fix overflow in SharedBuffer [DO NOT MERGE]
See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 66b6eb9490)

Change-Id: Ic71dd0025b9a7588c4f3bb1c7be1bd13d2ff5105
2015-08-25 16:18:16 +01:00
Sergio Giro
ca15dfd05c am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
* commit '3fe4051430be1da4c1f119c165a4bb8b3a9dd499':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:11:49 +00:00
Sergio Giro
3fe4051430 am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
* commit '66b6eb9490beeeabc804d790c1c4060ce047afd4':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:06:38 +00:00
Sergio Giro
66b6eb9490 [DO NOT MERGE] libutils: fix overflow in SharedBuffer
See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 7987b83553)

Change-Id: I3cac87185f209dc79678ae702aa18afbdf4190df
2015-08-21 20:36:19 +01:00
Abhishek Arya
d34846b70b am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
* commit 'cd407a17fe326f3e18866ddddb1c747b06a45fc0':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:23:50 +00:00
Abhishek Arya
cd407a17fe am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
* commit 'e0dce90b0de2b2b7c2baae8035f810a55526effb':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:18:47 +00:00
Abhishek Arya
e0dce90b0d Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
Bug: 23290056
Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7
2015-08-20 21:55:55 -07:00