summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets."Nick Kralevich2013-12-193-21/+88
|\ | | | | | | | | * commit '67cb61ee5a8b8f5c967361430fff250e76c3a1dc': adb: Check sender's socket id when receiving packets.
| * Merge "adb: Check sender's socket id when receiving packets."Nick Kralevich2013-12-193-21/+88
| |\
| | * adb: Check sender's socket id when receiving packets.David 'Digit' Turner2013-12-163-21/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am b3bfe881: Merge "Make libutils Looper independent of frameworks/native"Brian Carlstrom2013-12-183-122/+211
|\ \ \ | |/ / | | | | | | | | | * commit 'b3bfe8818ae9cec129cf6d3ed30e5bb39e614fdb': Make libutils Looper independent of frameworks/native
| * | Merge "Make libutils Looper independent of frameworks/native"Brian Carlstrom2013-12-193-122/+211
| |\ \
| | * | Make libutils Looper independent of frameworks/nativeBrian Carlstrom2013-12-183-122/+211
| |/ / | | | | | | | | | Change-Id: I1dacca10a3cd7601abc3451b69ed761bf71c38fe
* | | am d27498cb: Merge "toolbox: date: use RTC subsystem on devices without ↵Greg Hackmann2013-12-171-14/+80
|\ \ \ | |/ / | | | | | | | | | | | | | | | /dev/alarm" * commit 'd27498cbef862fccb857d7d8970418b893f550ca': toolbox: date: use RTC subsystem on devices without /dev/alarm
| * | Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"Greg Hackmann2013-12-181-14/+80
| |\ \
| | * | toolbox: date: use RTC subsystem on devices without /dev/alarmGreg Hackmann2013-12-171-14/+80
| | | | | | | | | | | | | | | | | | | | Change-Id: I48c0fd1f4cffef936afb8d48d6d93babf006004d Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"Greg Hackmann2013-12-171-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'eb3e9dafbd7f1c4f13bdcafe1a30f9da3bed9108': toolbox: date: fix parameter type warnings
| * | | Merge "toolbox: date: fix parameter type warnings"Greg Hackmann2013-12-181-1/+1
| |\ \ \ | | |/ /
| | * | toolbox: date: fix parameter type warningsGreg Hackmann2013-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I810a9abee8bc0061c5007fe08197384f2b85754b Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without ↵Greg Hackmann2013-12-171-4/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | /dev/alarm" * commit '215f78ae55b479ca6a78f9762ea9920fea16cf45': toolbox: uptime: use clock_gettime() on devices without /dev/alarm
| * | | Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"Greg Hackmann2013-12-181-4/+14
| |\ \ \ | | |/ /
| | * | toolbox: uptime: use clock_gettime() on devices without /dev/alarmGreg Hackmann2013-12-171-4/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: Id7287ca179cc0b8390c054803a25a961dd550a34 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"Greg Hackmann2013-12-171-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '83a766373f4ee2036fe3824623b7881156fd2ee8': toolbox: uptime: fix unused parameter warnings
| * | | Merge "toolbox: uptime: fix unused parameter warnings"Greg Hackmann2013-12-181-1/+2
| |\ \ \ | | |/ /
| | * | toolbox: uptime: fix unused parameter warningsGreg Hackmann2013-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id240ce85bf09e1a81f4e2e2a7496ac7952edbf38 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | | am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without ↵Greg Hackmann2013-12-171-16/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | /dev/alarm" * commit '9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337': SystemClock: use clock_gettime() on devices without /dev/alarm
| * | | Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"Greg Hackmann2013-12-181-16/+9
| |\ \ \ | | |/ /
| | * | SystemClock: use clock_gettime() on devices without /dev/alarmGreg Hackmann2013-12-171-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | am 537f53b6: Merge "rootdir: add permissions for /dev/rtc0"Greg Hackmann2013-12-171-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '537f53b682eb0d99e90da2a3e7389ea474bc583d': rootdir: add permissions for /dev/rtc0
| * | | Merge "rootdir: add permissions for /dev/rtc0"Greg Hackmann2013-12-181-0/+1
| |\ \ \ | | |/ /
| | * | rootdir: add permissions for /dev/rtc0Greg Hackmann2013-12-171-0/+1
| |/ / | | | | | | | | | | | | Change-Id: If9d853bdae2399b1e7434f45df375ba1fd6dbe9c Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"Elliott Hughes2013-12-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '30f9b5092062a0c8b61356496128feaaf8cd4237': libdiskconfig: Use uintptr_t instead of uint32_t
| * | Merge "libdiskconfig: Use uintptr_t instead of uint32_t"Elliott Hughes2013-12-171-1/+1
| |\ \
| | * | libdiskconfig: Use uintptr_t instead of uint32_tAshok Bhat2013-12-171-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | 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>
* | | am 532f4658: Merge "AArch64: Correction of struct surface_t"Elliott Hughes2013-12-161-9/+11
|\ \ \ | |/ / | | | | | | | | | * commit '532f46582362f6b14d5e2a19600c2930385cdc30': AArch64: Correction of struct surface_t
| * | Merge "AArch64: Correction of struct surface_t"Elliott Hughes2013-12-161-9/+11
| |\ \
| | * | AArch64: Correction of struct surface_tMarcus Oakland2013-12-101-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The struct in the union with GGLSurface in struct surface_t assumed that the reserved field, which corresponds to the GGLsizei version field in the GGLSurface structure (where GGLsizei is define as being ssize_t in the system/core/include/pixelflinger/pixelflinger.h header file) is uint32_t. That is appropriate to the 32-bit system but is not appropriate to the 64-bit system, where ssize_t is 64-bits rather than 32-bits. The 32-bit system has also been tested and has no regression because of this change. Change-Id: I5cd84fd4a18fa0e63e27975f7b3d3e95b99cea58 Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | am fd7eabe4: Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."Elliott Hughes2013-12-1625-12/+4244
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fd7eabe4429ee6bbc18796b0c76033902fa63497': Pixelflinger: Add AArch64 support to pixelflinger JIT.
| * | | Merge "Pixelflinger: Add AArch64 support to pixelflinger JIT."Elliott Hughes2013-12-1625-12/+4244
| |\ \ \
| | * | | Pixelflinger: Add AArch64 support to pixelflinger JIT.Ashok Bhat2013-12-1225-12/+4244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | am cadb10c9: Merge "Pixelflinger: Support for handling 64-bit addresses in ↵Elliott Hughes2013-12-167-19/+80
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | GGL Assembler" * commit 'cadb10c9578c39e7f886a1fce11536258b2cac4e': Pixelflinger: Support for handling 64-bit addresses in GGL Assembler
| * | | | Merge "Pixelflinger: Support for handling 64-bit addresses in GGL Assembler"Elliott Hughes2013-12-167-19/+80
| |\ \ \ \ | | |/ / /
| | * | | Pixelflinger: Support for handling 64-bit addresses in GGL AssemblerAshok Bhat2013-12-127-19/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | am e4335483: Merge "Relabel /data/misc/zoneinfo"Nick Kralevich2013-12-161-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'e4335483e78292800e27c7bf0a67d23bee47dc84': Relabel /data/misc/zoneinfo
| * | | | Merge "Relabel /data/misc/zoneinfo"Nick Kralevich2013-12-161-0/+1
| |\ \ \ \
| | * | | | Relabel /data/misc/zoneinfoNick Kralevich2013-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files in zoneinfo changed from system_data_file to zoneinfo_data_file. Fixup pre-existing files. Change-Id: Idddbd6c2ecf66cd16b057a9ff288cd586a109949
* | | | | | am e1a475c0: Merge "Force alignment of data buffer used to process netlink ↵Elliott Hughes2013-12-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages" * commit 'e1a475c0b4b73ec72fae12ea310b038d87a71b0e': Force alignment of data buffer used to process netlink messages
| * | | | | Merge "Force alignment of data buffer used to process netlink messages"Elliott Hughes2013-12-141-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Force alignment of data buffer used to process netlink messagesChris Dearman2013-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids any overhead associated with accessing unaligned data while processing netlink messages. Change-Id: I1ea13051816ef46b6627594121d98cda130ac609
* | | | | | am 4928d8d0: Merge "Fix ExtractEntryToFile."Narayan Kamath2013-12-133-5/+57
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '4928d8d072b5fab695f88437987c4be10781f40c': Fix ExtractEntryToFile.
| * | | | | Merge "Fix ExtractEntryToFile."Narayan Kamath2013-12-133-5/+57
| |\ \ \ \ \
| | * | | | | Fix ExtractEntryToFile.Narayan Kamath2013-12-133-5/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am d5f97db5: Merge "libion: Use %zu for size_t"Elliott Hughes2013-12-131-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd5f97db507f47b0db0d15c8a809ce33c46391228': libion: Use %zu for size_t
| * | | | | | Merge "libion: Use %zu for size_t"Elliott Hughes2013-12-131-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | libion: Use %zu for size_tAshok Bhat2013-12-101-2/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: If92fc31ab676a569530c21e655a1b5b451f5c5e5 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | am a67b39cb: Merge "Pixelflinger: Fix issue of pointers being stored in ints"Elliott Hughes2013-12-124-8/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'a67b39cb612744764ad9cd9a78aabd6b5742a384': Pixelflinger: Fix issue of pointers being stored in ints
| * | | | | Merge "Pixelflinger: Fix issue of pointers being stored in ints"Elliott Hughes2013-12-124-8/+8
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
generated by cgit v1.1 at 2025-02-04 04:45:27 +0000