Commit graph

23374 commits

Author SHA1 Message Date
David Pursell
f2aa186c7b adbd: properly close subprocess pipes on Ctrl+C.
When non-interactive sessions exit via Ctrl+C, adbd sends SIGHUP
to the child process to let it know to exit. However, adbd was not
closing the pipes to the child process, so if the subprocess ignored
SIGHUP and continued writing it could fill up the pipe and block
forever while adbd waits for it to exit.

This CL adds the necessary calls to close the subprocess pipe after
sending SIGHUP.

Bug: 28981563
Change-Id: I318e322e563241052648361172f4859c297837fb
2016-06-06 09:59:34 -07:00
Elliott Hughes
425c0f9eb7 Merge "Remove toolbox ioctl." am: 0fdd663262
am: ee915afa21

* commit 'ee915afa2117725bae8a083b9116dd07b4a51e7c':
  Remove toolbox ioctl.

Change-Id: I61c85490b29b2d4de2ffb9cdd7f9fa40e445c28d
2016-06-04 16:31:36 +00:00
Elliott Hughes
ee915afa21 Merge "Remove toolbox ioctl."
am: 0fdd663262

* commit '0fdd663262ccaff2f6ac6459a5bd9abf76c2cb5f':
  Remove toolbox ioctl.

Change-Id: I0ed7e7383828619f3804263c18e657efdabf1cb2
2016-06-04 16:25:04 +00:00
Treehugger Robot
0fdd663262 Merge "Remove toolbox ioctl." 2016-06-04 16:14:39 +00:00
Elliott Hughes
1f406e270f Remove toolbox ioctl.
Let's remove this convenient tool for attacking buggy kernels and see if
anyone with a legitimate use notices. I suspect most potential legitimate
users write a short C program instead anyway.

Bug: http://b/29128170
Change-Id: I14e8b8594902951fe0b94c9ce13baa2c4d7b9e6e
2016-06-04 08:12:34 -07:00
Mark Salyzyn
8739660239 Merge "logpersist: switch to pgrep from ps" am: 68285c0033
am: b749a0c02f

* commit 'b749a0c02fa925c77eae7eff5198a5e34be0cfb6':
  logpersist: switch to pgrep from ps

Change-Id: Ia4e06f203824539c3d6f6e7d7f88f1e955a626bf
2016-06-03 21:51:32 +00:00
Mark Salyzyn
b749a0c02f Merge "logpersist: switch to pgrep from ps"
am: 68285c0033

* commit '68285c00334af57d9077648fb408a34643514df5':
  logpersist: switch to pgrep from ps

Change-Id: I5a4142c91f152740003c733a1baca8f3318de259
2016-06-03 21:41:03 +00:00
Treehugger Robot
68285c0033 Merge "logpersist: switch to pgrep from ps" 2016-06-03 21:34:01 +00:00
Josh Gao
771c1ed582 Merge "cutils: don\'t fortify property_get on clang." am: 310da0b990
am: 2a1f209245

* commit '2a1f20924516b41e22adb766b6751869fb5c3af4':
  cutils: don't fortify property_get on clang.

Change-Id: Idd7402dca16633fa19e2110b6d74b005b3e519f9
2016-06-03 19:46:05 +00:00
Josh Gao
2a1f209245 Merge "cutils: don\'t fortify property_get on clang."
am: 310da0b990

* commit '310da0b9904d33d58315a974351375bbc663bf89':
  cutils: don't fortify property_get on clang.

Change-Id: I04a0ea55a5c5b04d3c2180915bd52a7d3b5a95f3
2016-06-03 19:38:27 +00:00
Treehugger Robot
310da0b990 Merge "cutils: don't fortify property_get on clang." 2016-06-03 19:29:12 +00:00
Siqi Lin
8edfe2040b Revert "adb: close ep0 on disconnection."
am: 8c4076295e

* commit '8c4076295ebd867d276636d673b9f8e6a8df01a6':
  Revert "adb: close ep0 on disconnection."

Change-Id: I74112ef3f508016238a3eb1224292aa4d77334d5
2016-06-03 04:46:25 +00:00
Siqi Lin
8c4076295e Revert "adb: close ep0 on disconnection."
This reverts commit 69e97e4bee.

Bug: 28932120
Change-Id: I5e2569abed316c089886556c432bfe59bca08549
(cherry picked from commit 57de0514f0)
2016-06-02 17:30:43 -07:00
Josh Gao
74ebdf3c8e cutils: don't fortify property_get on clang.
clang doesn't do the frontend inlining/dead code elimination needed for
the fortified implementation to work. Therefore, turn it off.

Bug: http://b/28381737
Change-Id: Ie8dd970e3908b1daaa587ad2bd041e8f6e2089db
2016-06-02 15:29:11 -07:00
Mark Salyzyn
1d945119c0 logpersist: switch to pgrep from ps
Changes expected output from a line cut from the less than portable
ps output to reporting the pid of logcatd (uid=logd comm=logcat).
Preserve reporting an error code if logcatd did not start.

Bug: 29075536
Change-Id: I61aa0a4787d4594c415d2c7db5bbb0e512676bf8
2016-06-02 09:51:13 -07:00
Colin Cross
bfcb1b779f Merge "Remove deprecated Android.mk files" am: ce5b4fee23
am: 5806404e4d

* commit '5806404e4d693699fef2e710fd8ad836815f8852':
  Remove deprecated Android.mk files

Change-Id: I8a87996377bd53a16d330c0df9bfff84c92e10a2
2016-06-02 16:41:27 +00:00
Colin Cross
5806404e4d Merge "Remove deprecated Android.mk files"
am: ce5b4fee23

* commit 'ce5b4fee23924262c8b3763c71ac5d73625cded2':
  Remove deprecated Android.mk files

Change-Id: Ibf28ba59c997334cb7a0043b370873e3b3817377
2016-06-02 16:38:58 +00:00
Colin Cross
ce5b4fee23 Merge "Remove deprecated Android.mk files" 2016-06-02 16:31:42 +00:00
Calin Juravle
65d7c4722c Merge "Add utility to prepare files in a similar way to directories" into nyc-dev
am: 6a29fe931d

* commit '6a29fe931d9fd3bf7f2aad3713dc70c080970763':
  Add utility to prepare files in a similar way to directories

Change-Id: I288024d55e8cead1c902950938b03bfa8dcc3df3
2016-06-02 10:24:54 +00:00
Calin Juravle
6a29fe931d Merge "Add utility to prepare files in a similar way to directories" into nyc-dev 2016-06-02 10:10:37 +00:00
Daniel Micay
12d2422ef0 add a property for controlling perf_event_paranoid
am: fe01f56c0d

* commit 'fe01f56c0d5c42508e1e82f5976e4c10bb00f632':
  add a property for controlling perf_event_paranoid

Change-Id: Ie4a85deeb9b4c213159549561eb648695a02ac82
2016-06-02 02:05:20 +00:00
Daniel Micay
fe01f56c0d add a property for controlling perf_event_paranoid
(Cherry picked from commit 2b22a66382)

This adds a system property for controlling unprivileged access to
perf_event_paranoid. It depends on adding kernel support for
perf_event_paranoid=3 based on grsecurity's PERF_HARDEN feature to
completely disable unprivileged access to perf. A minimal port of this
feature is used in the vanilla Debian kernel by default.

It hides the non-hardened value as an implementation detail, since while
it is currently 1, it will probably become 2 in the future.

Bug: 29054680

Change-Id: I6e3ae3cf18d8c76df94f879c34fb6fde519b89a9
2016-06-01 16:58:48 -07:00
Dan Willemsen
9ce49be616 Merge "Fix liblog logtags" am: 59e6afc617
am: 6b5255722e

* commit '6b5255722e7497fc7c854cf1ae9e51322bc7ceae':
  Fix liblog logtags

Change-Id: I6225d8fd338b9ffc5b4406d5dbb92e2816bcaaad
2016-06-01 23:47:45 +00:00
Dan Willemsen
6b5255722e Merge "Fix liblog logtags"
am: 59e6afc617

* commit '59e6afc617bf5ce341de4f3d0428c2b1a79879ee':
  Fix liblog logtags

Change-Id: I081aed7de6c8d4f038941d5baa8a5305207fddb0
2016-06-01 23:39:37 +00:00
Jeffrey Vander Stoep
680b2f3cb6 Merge "add a property for controlling perf_event_paranoid" am: 9292d7dae3
am: a6d6f45037

* commit 'a6d6f45037025175b3074661c9d2d80931d71817':
  add a property for controlling perf_event_paranoid

Change-Id: Ic1e1a1365735f73edde6767bf71da8c6e59b46a4
2016-06-01 23:33:12 +00:00
Treehugger Robot
59e6afc617 Merge "Fix liblog logtags" 2016-06-01 23:28:10 +00:00
Daniel Micay
a6d6f45037 Merge "add a property for controlling perf_event_paranoid"
am: 9292d7dae3

* commit '9292d7dae3bdfd5e50b8cad7fac843b2909bcec9':
  add a property for controlling perf_event_paranoid

Change-Id: If3d0b6079e5e69527da078ad40ca228d5d9509f8
2016-06-01 23:25:04 +00:00
Jeffrey Vander Stoep
9292d7dae3 Merge "add a property for controlling perf_event_paranoid" 2016-06-01 23:18:45 +00:00
Dan Willemsen
d119101807 Fix liblog logtags
This was broken because we didn't have logtags support in Soong.

Bug: 28989759
Change-Id: I8370a73cf14703b86aafd85e7ea74fc570c3ff0f
2016-06-01 15:32:35 -07:00
Luis Hector Chavez
6ed783a72c Merge "core: Update libchrome APIs to r395517" am: 51814a0142
am: 374b7aec14

* commit '374b7aec14b8e1a4471a619028211af6fc958211':
  core: Update libchrome APIs to r395517

Change-Id: Ib51007e95caeea1d62adf752b9541e40d4bc925f
2016-06-01 22:05:07 +00:00
Luis Hector Chavez
374b7aec14 Merge "core: Update libchrome APIs to r395517"
am: 51814a0142

* commit '51814a0142f3d49d6bed42aa149898866db99153':
  core: Update libchrome APIs to r395517

Change-Id: Ib038b956891b61afb5af199e4ec5f5342a59802a
2016-06-01 21:58:03 +00:00
Dan Willemsen
823d5bbc20 Merge "Remove invalid uses of -l and -I" am: 5d6193c658
am: 9ae3c079dc

* commit '9ae3c079dca647869dcbc5a5075609f0895e4f4c':
  Remove invalid uses of -l and -I

Change-Id: Id0ddd34cee10579684cdde36f3c095658a50784b
2016-06-01 21:57:27 +00:00
Dan Willemsen
9ae3c079dc Merge "Remove invalid uses of -l and -I"
am: 5d6193c658

* commit '5d6193c658ba14be9067cfe6e222c0601e328d63':
  Remove invalid uses of -l and -I

Change-Id: I346ffa30948ccdc1839f6be7028238e4c110e9b3
2016-06-01 21:50:51 +00:00
Luis Hector Chavez
51814a0142 Merge "core: Update libchrome APIs to r395517" 2016-06-01 21:50:03 +00:00
Treehugger Robot
5d6193c658 Merge "Remove invalid uses of -l and -I" 2016-06-01 21:38:18 +00:00
Dan Willemsen
ee2da03e26 Remove invalid uses of -l and -I
LOCAL_LDLIBS should only be used with -l flags for NDK and some host
libraries. Other uses should use LOCAL_SHARED_LIBRARIES.

LOCAL_LDFLAGS should not contain -l entries, they should be in
LOCAL_LDLIBS instead.

LOCAL_CFLAGS should not contain -I entries, those should use
LOCAL_C_INCLUDES instead.

Change-Id: Ic901aa14651572ac682166becd4f0cd86baecc34
2016-06-01 13:41:23 -07:00
Jeff Vander Stoep
c1b985435f resolve merge conflicts of adadb7d to nyc-dev-plus-aosp
Change-Id: I03bcd3f68f49160ccaa820b3983ca9a88adf6c57
2016-06-01 11:46:42 -07:00
William Roberts
adadb7df21 Merge "fs_mgr: pass sehandle to ext4 format routine"
am: 58ea31cc90

* commit '58ea31cc9013b8aab168cb828571ffc44721d9ef':
  fs_mgr: pass sehandle to ext4 format routine

Change-Id: I1f09241fb6af883b737ff24ef39483bcd6647499
2016-06-01 17:47:07 +00:00
Treehugger Robot
58ea31cc90 Merge "fs_mgr: pass sehandle to ext4 format routine" 2016-06-01 17:30:09 +00:00
David Sehr
b829f909f7 add /data/misc/profman for output
am: 0eb24e1bc7

* commit '0eb24e1bc7317eb5764567223cdd9405d16aefa7':
  add /data/misc/profman for output

Change-Id: Id672a7e5f4b64c9b3d707b4f45f1e7f8ce40ca34
2016-06-01 14:01:10 +00:00
David Sehr
0eb24e1bc7 add /data/misc/profman for output
Bug: 28748264
Change-Id: Ib57ccc570de446e03ea8c27ce8e404929138b213
2016-05-31 17:36:41 -07:00
Daniel Micay
2b22a66382 add a property for controlling perf_event_paranoid
This adds a system property for controlling unprivileged access to
perf_event_paranoid. It depends on adding kernel support for
perf_event_paranoid=3 based on grsecurity's PERF_HARDEN feature to
completely disable unprivileged access to perf. A minimal port of this
feature is used in the vanilla Debian kernel by default.

It hides the non-hardened value as an implementation detail, since while
it is currently 1, it will probably become 2 in the future.

Bug: 29054680

Change-Id: I6e3ae3cf18d8c76df94f879c34fb6fde519b89a9
2016-05-31 17:45:05 -04:00
Erik Kline
deb4e6e596 Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev
am: 088f0e7c40

* commit '088f0e7c40a1cc66505f2bd73c54f3bab9908986':
  Add /vendor/xbin to the list of directories of executables

Change-Id: Ib1172d5a5f0f0f1a82ce5ca260ef4539761ef679
2016-05-30 02:36:42 +00:00
Erik Kline
088f0e7c40 Merge "Add /vendor/xbin to the list of directories of executables" into nyc-dev 2016-05-30 02:31:46 +00:00
Elliott Hughes
8d96370fb2 Merge "Kill adb\'s ScopedFd for unique_fd." am: 0f3fde210d
am: b8901de2ad

* commit 'b8901de2adca421ad10d91cdfd35851f0473464a':
  Kill adb's ScopedFd for unique_fd.

Change-Id: Idb0559a08423b9985058866ba906580353e5a7e5
2016-05-28 02:17:19 +00:00
Elliott Hughes
b8901de2ad Merge "Kill adb\'s ScopedFd for unique_fd."
am: 0f3fde210d

* commit '0f3fde210d01263e780aa331472878813fbec8b8':
  Kill adb's ScopedFd for unique_fd.

Change-Id: Ibe1eec278f70212faeb59185a5a79c0bfe9ba245
2016-05-28 02:14:27 +00:00
Treehugger Robot
0f3fde210d Merge "Kill adb's ScopedFd for unique_fd." 2016-05-28 02:06:18 +00:00
Elliott Hughes
2ce86e527b Kill adb's ScopedFd for unique_fd.
It's the adb unique_fd, but at least it's the same API...

Change-Id: If5d6642457e145c450374fde6f1358e5ac386a96
2016-05-27 17:51:24 -07:00
Elliott Hughes
500c7e5bc7 Merge "Kill load_file." am: b42e4a6b63
am: 198a727891

* commit '198a727891aef33469d82b263fc222e4f4335b1b':
  Kill load_file.

Change-Id: I81d715153b8b882ace9deb073abfc4dde5535811
2016-05-28 00:30:31 +00:00
Elliott Hughes
198a727891 Merge "Kill load_file."
am: b42e4a6b63

* commit 'b42e4a6b635aa6749901bb2c6794a43da4a1722d':
  Kill load_file.

Change-Id: I179be388a76da1c5ba5e96d4e15009b127ca886c
2016-05-28 00:28:02 +00:00