Commit Graph

6773 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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
Elliott Hughes e1a475c0b4 Merge "Force alignment of data buffer used to process netlink messages" 2013-12-14 00:13:32 +00:00
Nick Kralevich 354e9edbd7 Relabel /data/misc/zoneinfo
The files in zoneinfo changed from system_data_file to
zoneinfo_data_file. Fixup pre-existing files.

Change-Id: Idddbd6c2ecf66cd16b057a9ff288cd586a109949
2013-12-13 16:03:48 -08:00
Narayan Kamath d61266d016 am 4928d8d0: Merge "Fix ExtractEntryToFile."
* commit '4928d8d072b5fab695f88437987c4be10781f40c':
  Fix ExtractEntryToFile.
2013-12-13 10:16:19 -08:00
Narayan Kamath 4928d8d072 Merge "Fix ExtractEntryToFile." 2013-12-13 18:13:01 +00:00
Narayan Kamath 00a258cec7 Fix ExtractEntryToFile.
We would always write uncompressed data at offset 0 instead
of the current filedescriptor offset.

Also adds a unit-test & a clarifying comment on the API.

Change-Id: If44757e96dde504ce63d81b4dec7115fc6f6d5fb
2013-12-13 17:56:57 +00:00
Elliott Hughes f595365fef am d5f97db5: Merge "libion: Use %zu for size_t"
* commit 'd5f97db507f47b0db0d15c8a809ce33c46391228':
  libion: Use %zu for size_t
2013-12-13 09:45:20 -08:00
Elliott Hughes d5f97db507 Merge "libion: Use %zu for size_t" 2013-12-13 17:38:23 +00:00
Elliott Hughes 5b8daae044 am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"
* commit 'a67b39cb612744764ad9cd9a78aabd6b5742a384':
  Pixelflinger: Fix issue of pointers being stored in ints
2013-12-12 13:25:36 -08:00
Elliott Hughes a67b39cb61 Merge "Pixelflinger: Fix issue of pointers being stored in ints" 2013-12-12 21:22:33 +00:00
Ashok Bhat 658f89dc5c Pixelflinger: Add AArch64 support to pixelflinger JIT.
See the comment-block at the top of Aarch64Assembler.cpp
for overview on how AArch64 support has been implemented

In addition, this commit contains
[x] AArch64 inline asm versions of gglmul series of
    functions and a new unit test bench to test the
    functions

[x] Assembly implementations of scanline_col32cb16blend
    and scanline_t32cb16blend for AArch64, with unit
    test bench

Change-Id: I915cded9e1d39d9a2a70bf8a0394b8a0064d1eb4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-12 17:30:13 +00:00
Ashok Bhat bfc6dc4ca8 Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
GGLAssembler assumes addresses to be 32-bit and uses ARM 32-bit
instructions to load/store/manipulate addresses. To support, 64-bit
architectures, following changes has been done

1. ARMAssemblerInterface has been extended to support four new
   operations ADDR_LDR, ADDR_STR, ADDR_SUB, ADDR_ADD. Base class
   implements these virtual functions to use 32bit  equivalent
   function. This avoids existing 32-bit Assembler backend
   implementations like ARMAssembler and MIPSAssembler  from
   mapping the new functions to existing equivalent routines.
   This also allows 64-bit Architectures like AArch64 to override
   the function in their assembler backend implementations.

2. GGLAssembler code (spread over GGLAssembler.cpp, GGLAssembler.h
   and texturing.cpp) has been changed to use the new operations
   for address operations.

Change-Id: I3d7eace4691e3e47cef737d97ac67ce6ef4fb18d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-12 17:30:13 +00:00
Ashok Bhat d10afb1748 Pixelflinger: Fix issue of pointers being stored in ints
Pixelflinger's code makes assumptions, at certain places,
that pointers can be stored as ints. This patch makes use
of uintptr_t wherever pointers are stored as int or cast
to int.

Change-Id: Ie76f425cbc82ac038a747f77a95bd31774f4a8e8
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2013-12-12 17:30:13 +00:00
Narayan Kamath 3a5ab80d0f am 7d92b7cc: Merge "Get rid of some log spam."
* commit '7d92b7cc6580285ab7f8ef86be7512eafda89354':
  Get rid of some log spam.
2013-12-12 09:25:29 -08:00
Narayan Kamath 7d92b7cc65 Merge "Get rid of some log spam." 2013-12-12 17:19:40 +00:00