Commit graph

10345 commits

Author SHA1 Message Date
Narayan Kamath
6c53de92cf Follow up to change b638126ed DO NOT MERGE.
Resolves delta between the kitkat and L version of this patch.
Fixes the molly build on klp-dev.

bug: 22953624
Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36
2015-09-10 20:30:59 +00:00
Narayan Kamath
419e6c3c68 libutils: Fix integer overflows in VectorImpl.
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

(cherry picked from commit c609c31fb5)

Change-Id: I61644633db6b54fa230683615de9724f7fabf6fb
2015-09-09 12:05:06 +01:00
Narayan Kamath
b638126ed3 libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
Use external/safe-iop to check for overflows on arithmetic
operations.

Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.

Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.

bug: 22953624

(cherry picked from commit c609c31fb5)

Change-Id: I673b7ab142bed4fcba9159a00a65cf6bca6b1f6c
2015-09-09 11:20:13 +01:00
Sergio Giro
0cc9a6e6e1 libutils: fix overflow in SharedBuffer [DO NOT MERGE]
See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 66b6eb9490)

Change-Id: Ic71dd0025b9a7588c4f3bb1c7be1bd13d2ff5105
2015-08-25 16:18:16 +01:00
Sergio Giro
ca15dfd05c am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
* commit '3fe4051430be1da4c1f119c165a4bb8b3a9dd499':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:11:49 +00:00
Sergio Giro
3fe4051430 am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
* commit '66b6eb9490beeeabc804d790c1c4060ce047afd4':
  [DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:06:38 +00:00
Sergio Giro
66b6eb9490 [DO NOT MERGE] libutils: fix overflow in SharedBuffer
See
https://code.google.com/p/android/issues/detail?id=181910

Bug: 22952485
(cherry picked from commit 7987b83553)

Change-Id: I3cac87185f209dc79678ae702aa18afbdf4190df
2015-08-21 20:36:19 +01:00
Abhishek Arya
d34846b70b am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
* commit 'cd407a17fe326f3e18866ddddb1c747b06a45fc0':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:23:50 +00:00
Abhishek Arya
cd407a17fe am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
* commit 'e0dce90b0de2b2b7c2baae8035f810a55526effb':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:18:47 +00:00
Abhishek Arya
e0dce90b0d Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
Bug: 23290056
Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7
2015-08-20 21:55:55 -07:00
Sergio Giro
e67b584869 am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
* commit '4956c0fe1e582a8497aff34a41aeb8bf4748eef0':
  libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:28:53 +00:00
Sergio Giro
4956c0fe1e am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
* commit '5b85b1d40d619c2064d321364f212ebfeb6ba185':
  libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:23:47 +00:00
Sergio Giro
5b85b1d40d libutils: fix overflow in String8::allocFromUTF8
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908

Bug: 23290056

(cherry picked from commit 4eeacbeec0)

Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
(cherry picked from commit ebabef2752)
2015-08-18 20:52:25 +00:00
Adam Lesinski
058ad0b661 am e8582d65: am 9bd7afc0: Prevent integer overflow when allocating native_handle_t
* commit 'e8582d65ea03a91b5cdc2c374ec9a420f809138f':
  Prevent integer overflow when allocating native_handle_t
2015-05-27 23:23:19 +00:00
Adam Lesinski
e8582d65ea am 9bd7afc0: Prevent integer overflow when allocating native_handle_t
* commit '9bd7afc0a1de9589c13355178b6edc709bd0bddf':
  Prevent integer overflow when allocating native_handle_t
2015-05-27 23:13:06 +00:00
Adam Lesinski
9bd7afc0a1 Prevent integer overflow when allocating native_handle_t
User specified values of numInts and numFds can overflow
and cause malloc to allocate less than we expect, causing
heap corruption in subsequent operations on the allocation.

Bug: 19334482
Change-Id: I43c75f536ea4c08f14ca12ca6288660fd2d1ec55
2015-05-27 10:20:03 -07:00
Christopher Ferris
5bd963117a DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s ours
automerge: d7c8db1  -s ours

* commit 'd7c8db124c1b4b13d7f55f7c338913ec6d0cd3d1':
2014-11-03 20:53:33 +00:00
Christopher Ferris
91ce357633 resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.
automerge: e916313

* commit 'e916313defbd09479dc29d38f3aa467f3b296f7c':
2014-11-03 20:53:28 +00:00
Christopher Ferris
d7c8db124c DO NOT MERGE Restore libcorkscrew unwinding.
automerge: 5a69c1d  -s ours

* commit '5a69c1db365323f984c6a8afd1fc035551e96d99':
  DO NOT MERGE Restore libcorkscrew unwinding.
2014-10-24 20:37:13 +00:00
Christopher Ferris
e916313def resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.
Change-Id: Ic6b18eeae43c2ef2256a0508ac60c1724385d3b0
2014-10-24 13:20:17 -07:00
Narayan Kamath
66f0d93c26 Don't allow SUPPORTED_ABIs to be set by the native bridge.
SUPPORTED_ABIs is a prioritized list of all ABIs a device
support, and must not vary depending on whether or not an app
is emulated.

bug: 18061712
Change-Id: I3ec3897d23e37c645b4d9d9e6e32aae9afff952c
2014-10-21 18:33:27 +01:00
Adam Lesinski
a1ac84cd8d MingW doesn't handle __attribute__((weak)) for Windows PE
Windows PE format doesn't have the same support for weak symbols
as ELF does.

The symbol android_log_id_to_name was strangely omitted from the
resulting Windows executable and the callsite where it was supposed
to be called was relaced with a different symbol, which caused a crash
in AAPT on Windows.

This change works due to a careful set of #ifdefs that ensure only one
definition of android_log_id_to_name is defined, but there are other
uses of __attribute__((weak)) which should be inspected.

Change-Id: I3b58076e31d9b28c5143773a170e9ffda9fa3815
2014-10-20 12:33:59 -07:00
Xavier Ducrohet
1c77bf4ce5 Merge "Fix windows specific behavior of FileMap" into lmp-dev 2014-10-16 19:09:40 +00:00
Xavier Ducrohet
1a55aa5e34 Fix windows specific behavior of FileMap
The implementation of the FileMap destructor would
close the file, only on Windows, which did not match
the behavior on mac/linux.

This is because calling munmap does not close the file
descriptor. It must be closed separately, before or after
munmap.

On Windows, the file must also be closed manually,
before or after closing the mappingFile.

The change basically removes the closing file from
the windows-specific part of the destructor, to
make behavior more consistent on all platforms
where the caller to FileMap is responsible for closing
its own file (since FileMap receives an opened file).

Change-Id: I5e3cfffbb870d5f3595802ccac57dbc1dbf1ce6e
2014-10-16 12:09:06 -07:00
Xavier Ducrohet
cd1da4e04f Fix toolchain issue for windows build of libziparchive.
With mingw 4.8, the new default packed behavior is broken and makes
zip archive fails due to unexpected misalignment in
CentralDirectoryRecord.

This patch uses -mno-ms-bitfields to revert to the old packed
behavior.

Change-Id: Ic977c841e330e19451db1d31ddb22e570a525062
2014-10-16 07:49:16 +00:00
Dianne Hackborn
67f46cb0e1 Fix issue #18000467: processgroup truncates buffer
Change-Id: I3d98a4da9c47d83d25a11ff0ef94cfcab1feabea
2014-10-15 11:36:28 -07:00
Dianne Hackborn
2c5e7e102b Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram
It looks like there were a couple problems in the code:

- It would not 0-terminate the string it read, to make sure we didn't
  see garbage at the end.
- It didn't reduce buf_len as it processes data in the buffer, so if
  we need to read more we will increase the buffer length to be longer
  than the actual available data.

Also put in some logs about every thing we kill, so we can see what
is going on when debugging.  And add a special check for us trying
to kill pid 0 for any reason, since doing so seem to be terminal to
the caller.

Change-Id: I2fe29bfef08938b8a2eb182475c0705c14d8d84f
2014-10-13 17:52:32 -07:00
Daniel Rosenberg
8218b6aae9 newfs_msdos: Set sectors per fat once
There was an issue causing the fat size to shrink too small, causing
a fsck check to fail.

Bug: 17949028
Bug: 17761281
Change-Id: Id0207f2ab44e57ff81f5a53494b45344822a6495
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-10-10 14:40:48 -07:00
Christopher Ferris
3fe9adc932 Merge "Fix write past end of memory." into lmp-dev 2014-10-07 23:19:40 +00:00
Christopher Ferris
de722e56df Fix write past end of memory.
The computed flattened size of the blob does not match the size used by the
flatten function when the last cached entry size is not 4 byte aligned.

Bug: 17873145
Change-Id: I9f9fc102d4bde4681ae977b6de5f263aaaf56708
2014-10-07 14:52:31 -07:00
Christopher Ferris
4105613009 am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.
* commit '5a69c1db365323f984c6a8afd1fc035551e96d99':
  DO NOT MERGE Restore libcorkscrew unwinding.
2014-10-07 15:27:35 +00:00
Christopher Ferris
bf1f5cb928 am 290efd24: (-s ours) Log stack even if tombstone cannot be created.
* commit '290efd244d8af18811b2ef2dac8f30cc7a37e066':
  Log stack even if tombstone cannot be created.
2014-10-07 15:27:34 +00:00
Mike Lockwood
7569b7b39f Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev 2014-10-06 18:40:46 +00:00
Mike Lockwood
7e58899bcf Add bootanimation to audio group so it can play boot sound
Bug: 17674304

Change-Id: I5d31bc024fa36fedac2c0ba5c4a8b100937183ad
2014-10-02 16:22:43 -07:00
Jesse Hall
c263e671df Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev 2014-10-02 20:56:29 +00:00
Stephen Hines
2f431a8d5a Fix windows-specific error without messing up Makefile flags.
Bug: 14416410

The proper fix for the error/warning we encountered is to move winsock2.h
in front of windows.h.

Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
2014-10-01 17:37:06 -07:00
Stephen Hines
3ea87c33a1 Fix build breakage for missing -Wcpp option on old GCC versions.
Bug: 14416410
Change-Id: Ib30c3739d50d6122b3b4643051c72f2fa4985686
2014-10-01 17:16:37 -07:00
Stephen Hines
64f44b8444 Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev 2014-10-01 22:53:51 +00:00
Fred Fettinger
331a939bf8 init.trace.rc: fix race condition with class_start core
The systrace permissions from init.trace.rc and the "class_start core"
which launches surfaceflinger are both in an "on boot" section. However,
the init.trace.rc commands are parsed after all commands in init.rc.
This means that "class_start core" is executed before the chmod command
which allows processes to write to trace_marker. If any services
execute their first trace command before the chmod occurs, then that
service won't be able to write traces until the service is restarted.

To fix this, run all of the init.trace.rc commands in the "early-boot"
section to ensure they are completed first.

Bug: 17612265
Change-Id: Ibf544762173d5ba98272c66ef485d8eab7d70bf3
2014-10-01 12:29:29 -07:00
Calin Juravle
00851a53be Use initUnchangeableSystemProperty for initializing os.arch.
Bug: 17713104
Change-Id: Ic847579981efcd2fd0526c994d786ee8b7a8a316
2014-10-01 18:57:59 +01:00
Andrew Hsieh
b75d6f1429 Remove obsolete reference to ddk; Fixes for -Werror
Bug: 14416410

1. The new mingw-w64 toolchain x86_64-w64-mingw32-4.8 has ddk
   in x86_64-w64-mingw32/include/ddk
2. Add -Wno-error=cpp to suppress a warning that turns into error
   thanks to -Werror:

      Please include winsock2.h before windows.h
3. Cast GetLastError() return type DWORD to "int"
4. Include direct.h for _mkdir
5. Include stdint.h for uint8_t on Windows

Change-Id: I4bec0587f6573692f08c760da6c98ae551b8b5eb
2014-09-30 02:24:07 -07:00
Brian Carlstrom
479ce0c1f3 Merge "Fix mac build for nativebridge tests." into lmp-dev 2014-09-30 04:19:54 +00:00
Vince Harron
c75dac394e Merge "fix for adbd pinning CPU" into lmp-dev 2014-09-30 03:01:07 +00:00
Mark Salyzyn
7391575afd logd: in nonblocking read, sched_yield() synchronization
- sched_yield and lock synchronization in reader thread
  startup to give writer thread a chance to catch up

(cherry picked from commit f669acb018)

Bug: 17512203
Change-Id: I43cf0b4e2829b22b3ab4e537fa95ce13c76a869c
2014-09-29 11:09:22 -07:00
Calin Juravle
7e5a0aca2c Fix mac build for nativebridge tests.
Bug: 17671501

Change-Id: Id0d729a25a5cea2fed5005cdea750e9e94f46d21
2014-09-29 15:57:43 +01:00
jgu21
b3facbfdec LibNativeBridge: Add early init & env setup
Add a method to set up /proc/cpuinfo with enough privileges. Set
up the environment for an app in InitializeNativeBridge().

Turn on -Wall for libnativebridge.

(cherry picked from commit 962eb40abb)
(cherry picked from commit ab0da5a9a6)
(cherry picked from commit 2f71cb24fa)
(cherry picked from commit 04054e28e2)
(cherry picked from commit 4390a63236)

Bug: 17671501
Change-Id: Id4f4127d82737b5e56a77175e1068ff5cea60f9d
2014-09-26 13:04:36 -07:00
Vince Harron
af436b1e10 fix for adbd pinning CPU
adbd was spinning between select & read (0 bytes) for an adb_auth
socket.  The read documentation states: "On success, the number of
bytes read is returned (zero indicates end of file)" so the code has
been modified to close the connection (like the read error case).

BUG=17419868

Change-Id: I1d8fb70c8e1876225ba8d47ea0a2b6265a7d182b
2014-09-25 21:51:15 -07:00
Andreas Gampe
8dd3ea58fd Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev 2014-09-25 21:55:34 +00:00
Andreas Gampe
25bacb3ab7 Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
This reverts commit f00de413ed.

Bug: 17645833
Change-Id: Ie5480de9cf4da2c9167db2e6137679019a29f867
2014-09-25 21:46:56 +00:00
Jeff Sharkey
2b16bf88c7 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:57 +00:00