ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6794 commits 1 branch 0 tags 217 MiB
Commit graph

6794 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Kralevich
a0ce4e2880 am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets." 
* commit '98fdcfa9817bf54a8695c57366f4ff047ceddb85':
  adb: Check sender's socket id when receiving packets.
 2013-12-19 18:40:45 +00:00
Nick Kralevich
98fdcfa981 am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets." 
* commit '67cb61ee5a8b8f5c967361430fff250e76c3a1dc':
  adb: Check sender's socket id when receiving packets.
 2013-12-19 10:38:02 -08:00
Nick Kralevich
67cb61ee5a Merge "adb: Check sender's socket id when receiving packets." 2013-12-19 18:33:56 +00:00
Brian Carlstrom
b37b53bf07 am 87942c9a: am b3bfe881: Merge "Make libutils Looper independent of frameworks/native" 
* commit '87942c9aace72daf1efb7f912c95c98efefb4edc':
  Make libutils Looper independent of frameworks/native
 2013-12-19 07:20:44 +00:00
Brian Carlstrom
87942c9aac am b3bfe881: Merge "Make libutils Looper independent of frameworks/native" 
* commit 'b3bfe8818ae9cec129cf6d3ed30e5bb39e614fdb':
  Make libutils Looper independent of frameworks/native
 2013-12-18 23:18:18 -08:00
Brian Carlstrom
b3bfe8818a Merge "Make libutils Looper independent of frameworks/native" 2013-12-19 07:13:00 +00:00
Brian Carlstrom
1693d7e48f Make libutils Looper independent of frameworks/native 
Change-Id: I1dacca10a3cd7601abc3451b69ed761bf71c38fe
 2013-12-18 22:32:13 -08:00
Greg Hackmann
b1a82bcb11 am f1da46d2: am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm" 
* commit 'f1da46d293ce25311fe07e21b1e8859ac18653ef':
  toolbox: date: use RTC subsystem on devices without /dev/alarm
 2013-12-18 00:29:35 +00:00
Greg Hackmann
f1da46d293 am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm" 
* commit 'd27498cbef862fccb857d7d8970418b893f550ca':
  toolbox: date: use RTC subsystem on devices without /dev/alarm
 2013-12-17 16:26:57 -08:00
Greg Hackmann
e34618a24c am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix parameter type warnings" 
* commit 'd2ac1d8caa3eaf811df3a4f50c78a281c27f69a2':
  toolbox: date: fix parameter type warnings
 2013-12-18 00:26:09 +00:00
Greg Hackmann
9d1de8a812 am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm" 
* commit '0e23a3d4830e6a45bf9b4968da7553fab79205a8':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm
 2013-12-18 00:26:08 +00:00
Greg Hackmann
70f22d6b76 am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings" 
* commit '066a3862a38957fdcd5f20caa63c7931e9a0f433':
  toolbox: uptime: fix unused parameter warnings
 2013-12-18 00:26:07 +00:00
Greg Hackmann
7510fa3e71 am d38ca369: am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm" 
* commit 'd38ca369c07744abeb5477c6a524a683fb9a4927':
  SystemClock: use clock_gettime() on devices without /dev/alarm
 2013-12-18 00:26:07 +00:00
Greg Hackmann
c042bb01df am e25864b7: am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0" 
* commit 'e25864b752db0bc8ddc55f2c22cf1b8bcb2602bf':
  rootdir: add permissions for /dev/rtc0
 2013-12-18 00:26:06 +00:00
Greg Hackmann
d2ac1d8caa am eb3e9daf: Merge "toolbox: date: fix parameter type warnings" 
* commit 'eb3e9dafbd7f1c4f13bdcafe1a30f9da3bed9108':
  toolbox: date: fix parameter type warnings
 2013-12-17 16:23:34 -08:00
Greg Hackmann
0e23a3d483 am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm" 
* commit '215f78ae55b479ca6a78f9762ea9920fea16cf45':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm
 2013-12-17 16:23:33 -08:00
Greg Hackmann
066a3862a3 am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings" 
* commit '83a766373f4ee2036fe3824623b7881156fd2ee8':
  toolbox: uptime: fix unused parameter warnings
 2013-12-17 16:23:32 -08:00
Greg Hackmann
d38ca369c0 am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm" 
* commit '9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337':
  SystemClock: use clock_gettime() on devices without /dev/alarm
 2013-12-17 16:23:32 -08:00
Greg Hackmann
e25864b752 am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0" 
* commit '537f53b682eb0d99e90da2a3e7389ea474bc583d':
  rootdir: add permissions for /dev/rtc0
 2013-12-17 16:23:31 -08:00
Greg Hackmann
d27498cbef Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm" 2013-12-18 00:19:21 +00:00
Greg Hackmann
eb3e9dafbd Merge "toolbox: date: fix parameter type warnings" 2013-12-18 00:18:24 +00:00
Greg Hackmann
215f78ae55 Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm" 2013-12-18 00:18:03 +00:00
Greg Hackmann
83a766373f Merge "toolbox: uptime: fix unused parameter warnings" 2013-12-18 00:17:36 +00:00
Greg Hackmann
9ade11c1c5 Merge "SystemClock: use clock_gettime() on devices without /dev/alarm" 2013-12-18 00:17:26 +00:00
Greg Hackmann
537f53b682 Merge "rootdir: add permissions for /dev/rtc0" 2013-12-18 00:17:01 +00:00
Greg Hackmann
4a7bc60071 toolbox: date: use RTC subsystem on devices without /dev/alarm 
Change-Id: I48c0fd1f4cffef936afb8d48d6d93babf006004d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2013-12-17 14:45:39 -08:00
Greg Hackmann
c057503aaf toolbox: date: fix parameter type warnings 
Change-Id: I810a9abee8bc0061c5007fe08197384f2b85754b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2013-12-17 14:45:39 -08:00
Greg Hackmann
fa66f1e494 toolbox: uptime: use clock_gettime() on devices without /dev/alarm 
Change-Id: Id7287ca179cc0b8390c054803a25a961dd550a34
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2013-12-17 14:45:39 -08:00
Greg Hackmann
7f625ed026 toolbox: uptime: fix unused parameter warnings 
Change-Id: Id240ce85bf09e1a81f4e2e2a7496ac7952edbf38
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2013-12-17 14:45:39 -08:00
Greg Hackmann
64289760a2 SystemClock: use clock_gettime() on devices without /dev/alarm 
On devices with an up-to-date kernel, the back-in-time bug affecting
clock_gettime() has been fixed and it can safely be used as an
alternative to the ANDROID_ALARM_GET_TIME ioctl.  To ensure consistent
behavior on existing devices, make clock_gettime() a fallback for when
the alarm driver isn't available.

Change-Id: I384af5e7ec9e73e0bad4b6b0f987a8ea4583cba6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2013-12-17 14:45:39 -08:00
Greg Hackmann
a585e662e0 rootdir: add permissions for /dev/rtc0 
Change-Id: If9d853bdae2399b1e7434f45df375ba1fd6dbe9c
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2013-12-17 14:45:39 -08:00
Elliott Hughes
286ab6ce08 am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t" 
* commit '3278af85f984a1b6df56b010a93589f6068514e0':
  libdiskconfig: Use uintptr_t instead of uint32_t
 2013-12-17 21:22:16 +00:00
Elliott Hughes
3278af85f9 am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t" 
* commit '30f9b5092062a0c8b61356496128feaaf8cd4237':
  libdiskconfig: Use uintptr_t instead of uint32_t
 2013-12-17 13:19:42 -08:00
Elliott Hughes
30f9b50920 Merge "libdiskconfig: Use uintptr_t instead of uint32_t" 2013-12-17 21:15:42 +00:00
Ashok Bhat
35539affd8 libdiskconfig: Use uintptr_t instead of uint32_t 
Use uintptr_t instead of uint32_t when pointer is cast
to an integer type.

Change-Id: I03dd4c7ff66611661af466dfb7b393d461bb2d7d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2013-12-17 12:43:41 +00:00
Elliott Hughes
980093ca59 am 348856fa: am 532f4658: Merge "AArch64: Correction of struct surface_t" 
* commit '348856fadb03cd0d93d0af3f78c11555a343e97f':
  AArch64: Correction of struct surface_t
 2013-12-16 19:59:28 +00:00
Elliott Hughes
348856fadb am 532f4658: Merge "AArch64: Correction of struct surface_t" 
* commit '532f46582362f6b14d5e2a19600c2930385cdc30':
  AArch64: Correction of struct surface_t
 2013-12-16 11:56:33 -08:00
Elliott Hughes
532f465823 Merge "AArch64: Correction of struct surface_t" 2013-12-16 19:50:17 +00:00
Elliott Hughes
410a1966df am fd382f2e: am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT." 
* commit 'fd382f2e2f27377e0a61f442bff196b66b188293':
  Pixelflinger: Add AArch64 support to pixelflinger JIT.
 2013-12-16 19:49:33 +00:00
Elliott Hughes
fd382f2e2f am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT." 
* commit 'fd7eabe4429ee6bbc18796b0c76033902fa63497':
  Pixelflinger: Add AArch64 support to pixelflinger JIT.
 2013-12-16 11:47:14 -08:00
Elliott Hughes
fd7eabe442 Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT." 2013-12-16 19:42:55 +00:00
Elliott Hughes
f64b4a6a84 am 7fe10ded: am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler" 
* commit '7fe10dedfdefe952602d3507db3109eaa94d4068':
  Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
 2013-12-16 19:02:53 +00:00
Elliott Hughes
7fe10dedfd am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler" 
* commit 'cadb10c9578c39e7f886a1fce11536258b2cac4e':
  Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
 2013-12-16 10:59:19 -08:00
Elliott Hughes
cadb10c957 Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler" 2013-12-16 18:55:09 +00:00
Nick Kralevich
a24e9a8655 am 02ad8700: am e4335483: Merge "Relabel /data/misc/zoneinfo" 
* commit '02ad8700dd22d5bf5d73c638e3a45c35d5ef3d1d':
  Relabel /data/misc/zoneinfo
 2013-12-16 17:07:12 +00:00
Nick Kralevich
02ad8700dd am e4335483: Merge "Relabel /data/misc/zoneinfo" 
* commit 'e4335483e78292800e27c7bf0a67d23bee47dc84':
  Relabel /data/misc/zoneinfo
 2013-12-16 09:04:04 -08:00
Nick Kralevich
e4335483e7 Merge "Relabel /data/misc/zoneinfo" 2013-12-16 16:59:19 +00:00
David 'Digit' Turner
818d641c42 adb: Check sender's socket id when receiving packets. 
handle_packet() in adb.c didn't check that when an A_WRTE packet is
received, the sender's local-id matches the socket's peer id.

This meant that a compromised adbd server could sent packets to
the host adb server, spoofing the identity of another connected
device if it could "guess" the right host socket id.

This patch gets rid of the issue by enforcing even more checks
to ensure that all packets comply with the description in
protocol.txt.

+ Fix a bug where closing a local socket associated with a
  remote one would always send an A_CLSE(0, remote-id, "")
  message, though protocol.txt says that should only happen
  for failed opens.

  The issue was that local_socket_close() called
  remote_socket_close() after clearing the remote socket's
  'peer' field.

  The fix introduces a new asocket optional callback,
  named 'shutdown' that is called before that, and is
  used to send the A_CLSE() message with the right ID
  in remote_socket_shutdown().

  Also add some code in handle_packet() to detect
  invalid close commands.

Change-Id: I9098bc8c6e81f8809334b060e5dca4fc92e6fbc9
 2013-12-16 17:58:08 +01:00
Elliott Hughes
41e9ee2477 am feb539b6: am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages" 
* commit 'feb539b6e3d81a7f0ab86b6b48056a531c4cb4ed':
  Force alignment of data buffer used to process netlink messages
 2013-12-14 00:20:11 +00:00
Elliott Hughes
feb539b6e3 am e1a475c0: Merge "Force alignment of data buffer used to process netlink messages" 
* commit 'e1a475c0b4b73ec72fae12ea310b038d87a71b0e':
  Force alignment of data buffer used to process netlink messages
 2013-12-13 16:17:24 -08:00