Commit graph

22134 commits

Author SHA1 Message Date
Josh Gao
163802c244 adb: switch the socket list mutex to a recursive_mutex. am: 6f641adea5 am: a6b92d1f2e
am: 1f8c6c8c8e

Change-Id: I035c2436afc99078996fb655aa4b9554e7cc812e
2016-07-18 19:54:17 +00:00
Josh Gao
e2a5846402 adb: use asocket\\'s close function when closing. am: f71c01493a
am: d179556680

Change-Id: I484051c028f89e292567485db49e2e20d26030be
2016-07-18 19:50:46 +00:00
Josh Gao
1f8c6c8c8e adb: switch the socket list mutex to a recursive_mutex. am: 6f641adea5
am: a6b92d1f2e

Change-Id: I064738710ab360cbfeb0b669d7e531f955f8b9cb
2016-07-18 19:50:46 +00:00
Josh Gao
d179556680 adb: use asocket\'s close function when closing.
am: f71c01493a

Change-Id: Id77dd7ff1931f03ea7f1e0339eca6610e02e9122
2016-07-18 19:47:45 +00:00
Josh Gao
a6b92d1f2e adb: switch the socket list mutex to a recursive_mutex.
am: 6f641adea5

Change-Id: I839bc3817e7d7bb24b2bf3c5059919802c9f5d33
2016-07-18 19:47:45 +00:00
Josh Gao
36dd144367 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process.
Fix two races in debuggerd's PTRACE_ATTACH logic:
  1. The target thread in a crash dump request could exit between the
     /proc/<pid>/task/<tid> check and the PTRACE_ATTACH.
  2. Sibling threads could exit between listing /proc/<pid>/task and the
     PTRACE_ATTACH.

Backport of NYC change I4dfe1ea30e2c211d2389321bd66e3684dd757591
Bug: http://b/29555636
Change-Id: I320f47216b21018d3f613cfbbaaff40b3548ef36
2016-07-18 19:35:45 +00:00
Jeff Sharkey
96f387e8c0 Merge "Only restorecon CE storage after unlocked." into nyc-mr1-dev 2016-07-18 15:58:42 +00:00
TreeHugger Robot
efa8604a1d Merge "Add skip-secondary flag" into nyc-mr1-dev 2016-07-16 01:21:21 +00:00
Josh Gao
f71c01493a 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.

Bug: http://b/28347842
Change-Id: I40a1174845cd33f15f30ce70828a7081cd5a087e
(cherry picked from commit 53eb31d87c)
(cherry picked from commit 014b01706c)
2016-07-15 17:17:14 -07:00
Josh Gao
6f641adea5 adb: switch the socket list mutex to a recursive_mutex.
sockets.cpp was branching on whether a socket close function was
local_socket_close in order to avoid a potential deadlock if the socket
list lock was held while closing a peer socket.

Bug: http://b/28347842
Change-Id: I5e56f17fa54275284787f0f1dc150d1960256ab3
(functionally a cherrypick of 903b749f + 9b587dec, with windows disabled)
2016-07-15 17:17:14 -07:00
Daniel Rosenberg
e180929866 Add skip-secondary flag
The skip-secondary flag now replaces flash-primary. This flag will
skip over the secondary images for both flashall and update.

Change-Id: I9f380f3195006d325d6c45776bf79ecec17506ad
2016-07-15 16:57:53 -07:00
Jeff Sharkey
1635afe83d Only restorecon CE storage after unlocked.
On FBE devices, the filenames inside credential-encrypted directories
are mangled until the key is installed.  This means the initial
restorecon at boot needs to skip these directories until the keys
are installed.

This CL changes the implementation of the "restorecon_recursive"
built-in command to use the new SKIPCE flag to avoid labeling files
in CE directories.  vold will request a restorecon when the keys
are actually installed.

Bug: 30126557
Change-Id: I320584574a4d712c493b5bbd8a79b56c0c04aa58
2016-07-15 16:21:42 -06:00
Chris Tate
3fed75d404 Merge "Ensure the target sees a proper EOD marker during restore" into nyc-mr1-dev 2016-07-15 01:36:22 +00:00
Josh Gao
0528829b73 DO NOT MERGE: debuggerd: verify that traced threads belong to the right process.
Fix two races in debuggerd's PTRACE_ATTACH logic:
  1. The target thread in a crash dump request could exit between the
     /proc/<pid>/task/<tid> check and the PTRACE_ATTACH.
  2. Sibling threads could exit between listing /proc/<pid>/task and the
     PTRACE_ATTACH.

Backport of NYC change I4dfe1ea30e2c211d2389321bd66e3684dd757591
Bug: http://b/29555636
Change-Id: I320f47216b21018d3f613cfbbaaff40b3548ef36
2016-07-14 16:47:10 -07:00
Tianjie Xu
eddde7a130 Merge "Start update_verifier in cache group" into nyc-mr1-dev 2016-07-14 22:27:08 +00:00
Sergio Giro
c525915576 Merge \\\\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537 am: 5e03ed1dab am: b00e3603ef -s ours am: 72bad95df5 am: ae21a25383 am: 1062106a3b am: 9d6d33dba2 -s ours
am: 8c335e2840

Change-Id: I956018c7a1ac4b01f085126260c28328c16c577a
2016-07-14 18:50:35 +00:00
Sergio Giro
385b34e776 DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e am: 8c9d02551c am: 28f28ce635 -s ours am: f611765aaf am: 207717bde6 am: dc5a96f5b3 am: 1aad4b61cb -s ours
am: 8170f506f7

Change-Id: Iea68f2cf201296214d1cbcbd6d54ebdcb6332cb3
2016-07-14 18:50:30 +00:00
Sergio Giro
0f44e904e8 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457 am: 01dbd1da64 am: 7c516d7080 am: 062c13e997 -s ours
am: 254b45e573

Change-Id: I99a21536238f7ac5b0e0778d7608fc6ef8f5dea9
2016-07-14 18:50:25 +00:00
Sergio Giro
8c335e2840 Merge \\\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537 am: 5e03ed1dab am: b00e3603ef -s ours am: 72bad95df5 am: ae21a25383 am: 1062106a3b
am: 9d6d33dba2  -s ours

Change-Id: Id26c22b458fcd1b7ad32c58449dd9574bc464ad3
2016-07-14 18:47:12 +00:00
Sergio Giro
8170f506f7 DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e am: 8c9d02551c am: 28f28ce635 -s ours am: f611765aaf am: 207717bde6 am: dc5a96f5b3
am: 1aad4b61cb  -s ours

Change-Id: I0082b3b2c0e2347940f666d8a03811abe390de02
2016-07-14 18:47:04 +00:00
Sergio Giro
254b45e573 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457 am: 01dbd1da64 am: 7c516d7080
am: 062c13e997  -s ours

Change-Id: I932cc01acc74a8d148a6c9d25d5c35c48a324844
2016-07-14 18:44:28 +00:00
Sergio Giro
9d6d33dba2 Merge \\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537 am: 5e03ed1dab am: b00e3603ef -s ours am: 72bad95df5 am: ae21a25383
am: 1062106a3b

Change-Id: I441fc693e0f6861160ebc615b2ba15feba29e1a7
2016-07-14 18:29:27 +00:00
Sergio Giro
1aad4b61cb DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e am: 8c9d02551c am: 28f28ce635 -s ours am: f611765aaf am: 207717bde6
am: dc5a96f5b3

Change-Id: I02b02a89f381c1cadff3b4702e1ff8e8850b219e
2016-07-14 18:29:22 +00:00
Pat Tjin
46066ef405 Merge "core/init.rc: Add /data/cache/* directory creation" into nyc-mr1-dev 2016-07-14 18:28:51 +00:00
Sergio Giro
1062106a3b Merge \\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537 am: 5e03ed1dab am: b00e3603ef -s ours am: 72bad95df5
am: ae21a25383

Change-Id: I3c2f28c59c588a2cce0a00e33914181ac0d876ef
2016-07-14 18:27:01 +00:00
Sergio Giro
dc5a96f5b3 DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e am: 8c9d02551c am: 28f28ce635 -s ours am: f611765aaf
am: 207717bde6

Change-Id: I88e2cafcf84bff82c29725dd484103dabf248a8b
2016-07-14 18:26:58 +00:00
Sergio Giro
ae21a25383 Merge \\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537 am: 5e03ed1dab am: b00e3603ef -s ours
am: 72bad95df5

Change-Id: I157121792e7de52ae705afc105ebf31299612b59
2016-07-14 18:24:17 +00:00
Sergio Giro
207717bde6 DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e am: 8c9d02551c am: 28f28ce635 -s ours
am: f611765aaf

Change-Id: I236fac995374280f948759f44e673aff98b53447
2016-07-14 18:24:13 +00:00
Sergio Giro
062c13e997 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457 am: 01dbd1da64
am: 7c516d7080

Change-Id: Ieaea49b0baa026dd0666b884a1c64a303d19baf1
2016-07-14 18:23:56 +00:00
Mark Salyzyn
3ad493d961 Merge "liblog: reset pid and uid cache after a vfork()" into nyc-mr1-dev 2016-07-14 18:20:37 +00:00
Sergio Giro
7c516d7080 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 3411dd4457
am: 01dbd1da64

Change-Id: Id0ecb8e252b43cc5c77644310e4f8a2968876a37
2016-07-14 18:15:36 +00:00
Sergio Giro
e05a4d0d19 Merge \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into nyc-dev
am: 757f4ef340

Change-Id: I6c6b8514011925bd737eac34d0e62049eaef08c9
2016-07-14 18:08:08 +00:00
Sergio Giro
01dbd1da64 libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
am: 3411dd4457

Change-Id: I34322210bd7ab90c1986d55f9b444292e76c646a
2016-07-14 18:07:28 +00:00
Sergio Giro
72bad95df5 Merge \\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537 am: 5e03ed1dab
am: b00e3603ef  -s ours

Change-Id: Id73880ce44c4a1cb14c04b6e533e888ac28e1ae0
2016-07-14 18:03:17 +00:00
Sergio Giro
f611765aaf DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e am: 8c9d02551c
am: 28f28ce635  -s ours

Change-Id: I2ef3ab0e4e3c64c9b5c17454ab738f3d5bdb5dd3
2016-07-14 18:03:14 +00:00
Sergio Giro
b00e3603ef Merge \\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537
am: 5e03ed1dab

Change-Id: I69b9c166dcd1f76cfe6555cae0580366f79258cc
2016-07-14 18:00:50 +00:00
Sergio Giro
28f28ce635 DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e
am: 8c9d02551c

Change-Id: Ia8754c27d2d2a639280235c2dbf9043f3442421e
2016-07-14 17:59:56 +00:00
Sergio Giro
5e03ed1dab Merge \\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\" into lmp-dev am: 8d2d6cedbb -s ours
am: 71da8e7537

Change-Id: I1c9b5abdf550bb2e6f294c7f0920ff72e6bcfc0e
2016-07-14 17:59:48 +00:00
Sergio Giro
8c9d02551c DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
am: 2806397d1e

Change-Id: I28785c3aa9d2b11b045c53fea557c0d74bd65181
2016-07-14 17:52:06 +00:00
Sergio Giro
71da8e7537 Merge \"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into lmp-dev
am: 8d2d6cedbb  -s ours

Change-Id: Id0e0d5176560cf883da2e5507ba9106ecc624536
2016-07-14 17:52:05 +00:00
Sergio Giro
8d2d6cedbb Merge "DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" into lmp-dev 2016-07-14 17:36:23 +00:00
Sergio Giro
757f4ef340 Merge "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" into nyc-dev 2016-07-14 17:33:28 +00:00
Sergio Giro
2806397d1e 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 17:25:27 +00:00
Sergio Giro
98933455b5 Merge "libutils/Unicode.cpp: remove SafetyNet logging" into nyc-mr1-dev 2016-07-14 15:55:26 +00:00
Sergio Giro
3411dd4457 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.

Test: ran libutils_tests
Bug: 29250543
Change-Id: I6115e3357141ed245c63c6eb25fc0fd0a9a7a2bb
(cherry picked from commit c4966a363e)
2016-07-14 16:49:50 +01:00
Mark Salyzyn
ad3fdd3407 liblog: reset pid and uid cache after a vfork()
(cherry pick from commit ec4f5c776d)

Bionic getuid() and getpid() calls cache to reduce the need to
perform a syscall, and also reset their own cache after a vfork().
No more need for liblog to be performing this flawed cache operation.

Bug: 30085794
Change-Id: I70feed8bff0ddd919c2885a348ba67b14ddc0e0d
2016-07-14 08:49:02 -07:00
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
Sergio Giro
deb0b40f1f DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6 am: d0ad14ca21 am: 3841c92912 -s ours am: 247ac63c69 -s ours am: 6179f1a56e am: 451f4b3d04 am: 3c85e4e5e7 -s ours am: baac6666fe am: 2858362ffe am: 7a0c6bf505 am: f96271187f -s ours
am: 53d529a585

Change-Id: Ia49dd230eb055a8dba4306ecbdf7dc10098acccb
2016-07-14 14:05:46 +00:00
Sergio Giro
53d529a585 DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6 am: d0ad14ca21 am: 3841c92912 -s ours am: 247ac63c69 -s ours am: 6179f1a56e am: 451f4b3d04 am: 3c85e4e5e7 -s ours am: baac6666fe am: 2858362ffe am: 7a0c6bf505
am: f96271187f  -s ours

Change-Id: Ib04042a57e4b5d55eca95cbbea272446c499c07e
2016-07-14 13:59:29 +00:00
Sergio Giro
f96271187f DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6 am: d0ad14ca21 am: 3841c92912 -s ours am: 247ac63c69 -s ours am: 6179f1a56e am: 451f4b3d04 am: 3c85e4e5e7 -s ours am: baac6666fe am: 2858362ffe
am: 7a0c6bf505

Change-Id: Iea9431a42775b8aa6c89d7b5aaf407692f9e46b4
2016-07-14 13:53:15 +00:00