Commit graph

7202 commits

Author SHA1 Message Date
Narayan Kamath
fef9dffd96 am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit '6c53de92cf7e759488538280788325fac6ccdea2':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-11 09:50:09 +00:00
Narayan Kamath
a82d6dc3bf resolved conflicts for b638126e to klp-modular-dev
Change-Id: If5062b01afa95279ab25fe86aaafa89d4d74eaa1
2015-09-10 22:00:26 +01:00
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
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
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
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
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
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
5a69c1db36 DO NOT MERGE Restore libcorkscrew unwinding.
Bug: 15701117
Change-Id: I1d2164726b8f421d8e6741b84749fddb86b60809
2014-06-18 12:55:24 -07:00
Christopher Ferris
290efd244d Log stack even if tombstone cannot be created.
Bug: 14498701

(cherry picked from commit c5bb49a138)

Conflicts:
	debuggerd/tombstone.cpp

Change-Id: I888b3d683c3b880357b0b24f9204a9cca3e8f3be
2014-05-09 16:52:33 -07:00
Jeff Brown
a77bef47de Document the adb install -d option.
Change-Id: Ife0da42c22e4408dc5c07ac0f20e0ecbbde20832
2014-04-15 13:34:04 -07:00
Greg Hackmann
5b98e0499a rootdir: reduce permissions on /dev/rtc0
Remove world-readable, reduce group permissions to readable by system
daemons

Change-Id: I6c7d7d78b8d8281960659bb8490a01cf7fde28b4
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-31 13:16:28 -07:00
Michael Wright
df33e8b544 Add BitSet64. DO NOT MERGE
Change-Id: Idf3e21dfaa9f90f4dcb1b4d41eed3891dda99561
2014-03-24 16:51:01 -07:00
JP Abgrall
7283db6d26 am efbf36f2: init.rc: prep tcp_default_init_rwnd, set the default to 60
* commit 'efbf36f2dad8f083de6f48dbb682461d7cfa9781':
  init.rc: prep tcp_default_init_rwnd, set the default to 60
2014-03-14 16:28:05 +00:00
Dmitry Grinberg
0d4a4cb8aa fastboot: allow format on devices with small buffers
Formatting large partitions on devices with small transfer buffers did
not work before since format used a strange path through the code to
send data. It now uses the normal path. Also cleaned up a bit. FS
code now lives in a separate file and the custom path for format is
gone.

Change-Id: If4e01cabc2e250b7c02ca7ce8c268e51d49e1529
2014-03-13 15:55:11 -07:00
JP Abgrall
efbf36f2da init.rc: prep tcp_default_init_rwnd, set the default to 60
The kernel's default is between 4~20.

Prepare for javaland to modify the value at runtime.

It can be done via
  setprop sys.sysctl.tcp_def_init_rwnd  <value>


Bug: 12020135
Change-Id: Id34194b085206fd02e316401c0fbbb9eb52522d2
(cherry picked from commit 7c862c8b5e)
2014-03-13 00:25:51 +00:00
Nick Kralevich
9341262285 am 726beb6c: am 6941a83c: don\'t load property_contexts from /data
* commit '726beb6c4a02d14cc4637ec61cba09dbe097a149':
  don't load property_contexts from /data
2014-03-04 19:37:34 +00:00
Nick Kralevich
726beb6c4a am 6941a83c: don\'t load property_contexts from /data
* commit '6941a83c2dd34df606df13972576fbc23172c3c5':
  don't load property_contexts from /data
2014-03-04 19:34:16 +00:00
Nick Kralevich
6941a83c2d don't load property_contexts from /data
Bug: 12613118
Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
(cherry picked from commit dc3a42bb11)
2014-03-04 19:14:34 +00:00
Daniel Cashman
4bf3bb679a Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file." into klp-modular-dev 2014-03-04 18:29:30 +00:00
Nick Kralevich
5e96d89aa5 am 3530b9cd: am 02916aa2: Remove obsolete vdc call.
* commit '3530b9cd4675a5e0c5c02dd765450b84ace67401':
  Remove obsolete vdc call.
2014-03-04 08:26:45 +00:00
Nick Kralevich
3530b9cd46 am 02916aa2: Remove obsolete vdc call.
* commit '02916aa20e3ffbe4b738bb12dc1607a7ec6a8c37':
  Remove obsolete vdc call.
2014-03-04 08:23:06 +00:00
Nick Kralevich
02916aa20e Remove obsolete vdc call.
Since ca8e66a8b0, init has
been handling reboots and filesystem unmounts. Remove obsolete
call to vdc.

Bug: 12504045
Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881
(cherry picked from commit 225459a5da)
2014-03-04 04:54:00 +00:00
Stephen Smalley
5c3c77ed78 Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed
in the various device-specific init*.rc files but seems generic.
Move it to the main init.rc file.

Drop the separate chown for /data/misc/dhcp as this is handled by mkdir
built-in if the directory already exists.

Add a restorecon_recursive /data/misc/wifi/sockets.

Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-28 10:23:01 -08:00
Christopher Ferris
ab2de41574 am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."
* commit '773c9ab74cc2e42f25fe16756e0b7a693b1d2cf5':
  Fix global pointing to local variable.
2014-01-29 08:15:40 +00:00
Christopher Ferris
773c9ab74c am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."
* commit 'c96c29548fa0c933e5aa78116f90ff6be5c4fc39':
  Fix global pointing to local variable.
2014-01-29 08:11:02 +00:00
Christopher Ferris
c96c29548f am a152ed73: Merge "Fix global pointing to local variable."
* commit 'a152ed734f179ee2748d306f2eb57acbb4df1ace':
  Fix global pointing to local variable.
2014-01-29 08:07:27 +00:00
Christopher Ferris
a152ed734f Merge "Fix global pointing to local variable." 2014-01-29 06:29:58 +00:00
Christopher Ferris
2b4ae52a56 Fix global pointing to local variable.
Change-Id: I933cbb680ca6310c13634f09a9827077c8dbd568
2014-01-28 22:21:14 -08:00
Kristian Monsen
da0d5bd147 am a40636f3: am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"
* commit 'a40636f33fe4f2dbd99e58c98609445ecf5870b8':
  Fix code style, put unused in the end
2014-01-28 22:33:22 +00:00
Kristian Monsen
a40636f33f am 5abe06bf: am 6e34793b: Merge "Fix code style, put unused in the end"
* commit '5abe06bf8bfed0c15dc56b6d2cd30cc10c898153':
  Fix code style, put unused in the end
2014-01-28 22:28:08 +00:00
Kristian Monsen
5abe06bf8b am 6e34793b: Merge "Fix code style, put unused in the end"
* commit '6e34793b9cf11237670a5daa320cd784f7442532':
  Fix code style, put unused in the end
2014-01-28 22:25:15 +00:00
Kristian Monsen
6e34793b9c Merge "Fix code style, put unused in the end" 2014-01-28 22:18:00 +00:00
Christopher Ferris
36a4e4085e am aaf89887: am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."
* commit 'aaf898877c4225f939b27ca48bb5f474fc9b46ae':
  Re-enable libunwind for arm.
2014-01-28 21:37:20 +00:00
Christopher Ferris
aaf898877c am 6fe31b2f: am d391c9b4: Merge "Re-enable libunwind for arm."
* commit '6fe31b2f830309c2a8e0035c07b6b2bb44e081c9':
  Re-enable libunwind for arm.
2014-01-28 21:35:25 +00:00
Christopher Ferris
6fe31b2f83 am d391c9b4: Merge "Re-enable libunwind for arm."
* commit 'd391c9b4acb2bcd6cec048075e728d3aee6a0d6f':
  Re-enable libunwind for arm.
2014-01-28 21:29:51 +00:00
Christopher Ferris
d391c9b4ac Merge "Re-enable libunwind for arm." 2014-01-28 21:23:50 +00:00
Mark Salyzyn
3a5f305062 am 7b9bb36a: am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* commit '7b9bb36ade6c8fa2e77416143847b019ddda9e95': (29 commits)
  libsysutils: SocketListener export release
  libsysutils: Add iovec/runOnEachSocket
  liblog: support struct logger_event_v2 format
  liblog: update timestamp on NOTICE file
  libcutils: resolve warning in iosched_policy.c
  liblog: Add const pedantics
  logcat: Add -T flag (-t w/o assumption of -d)
  logcat: Add logcat test suite
  liblog: Add cpu utilization test
  liblog: Add liblog test suite
  debuggerd: Support newline split in log messages
  liblog: deprecate export LOGGER ioctl definitions
  liblog: deprecate export of LOGGER_LOG_* defines
  liblog: Add README
  liblog: resolve build warning messages
  liblog: high CPU usage from logcat
  liblog: fix build again
  liblog: drop use of sys/cdefs.h
  liblog: git_master@964770 build problem
  logcat: Incorporate liblog reading API
  ...
2014-01-28 21:20:39 +00:00
Kristian Monsen
7ddca5adb6 Fix code style, put unused in the end
Change-Id: I7315b35049924d5067203a432584b8f29e5a1391
2014-01-28 13:19:11 -08:00
Mark Salyzyn
7b9bb36ade am 0256e1f6: am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* commit '0256e1f68bb8af10478b690c8fb772a0ec2027e3': (29 commits)
  libsysutils: SocketListener export release
  libsysutils: Add iovec/runOnEachSocket
  liblog: support struct logger_event_v2 format
  liblog: update timestamp on NOTICE file
  libcutils: resolve warning in iosched_policy.c
  liblog: Add const pedantics
  logcat: Add -T flag (-t w/o assumption of -d)
  logcat: Add logcat test suite
  liblog: Add cpu utilization test
  liblog: Add liblog test suite
  debuggerd: Support newline split in log messages
  liblog: deprecate export LOGGER ioctl definitions
  liblog: deprecate export of LOGGER_LOG_* defines
  liblog: Add README
  liblog: resolve build warning messages
  liblog: high CPU usage from logcat
  liblog: fix build again
  liblog: drop use of sys/cdefs.h
  liblog: git_master@964770 build problem
  logcat: Incorporate liblog reading API
  ...
2014-01-28 21:18:01 +00:00
Mark Salyzyn
0256e1f68b am d2acdd82: Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* commit 'd2acdd82e613b3e1d79a00943ac3bf5fbc14a766': (29 commits)
  libsysutils: SocketListener export release
  libsysutils: Add iovec/runOnEachSocket
  liblog: support struct logger_event_v2 format
  liblog: update timestamp on NOTICE file
  libcutils: resolve warning in iosched_policy.c
  liblog: Add const pedantics
  logcat: Add -T flag (-t w/o assumption of -d)
  logcat: Add logcat test suite
  liblog: Add cpu utilization test
  liblog: Add liblog test suite
  debuggerd: Support newline split in log messages
  liblog: deprecate export LOGGER ioctl definitions
  liblog: deprecate export of LOGGER_LOG_* defines
  liblog: Add README
  liblog: resolve build warning messages
  liblog: high CPU usage from logcat
  liblog: fix build again
  liblog: drop use of sys/cdefs.h
  liblog: git_master@964770 build problem
  logcat: Incorporate liblog reading API
  ...
2014-01-28 21:13:55 +00:00
Mark Salyzyn
d2acdd82e6 Merge changes I70ab37d5,I716f89c0,I34c96adf,I77650923,I35b0d1ee, ...
* changes:
  libsysutils: SocketListener export release
  libsysutils: Add iovec/runOnEachSocket
  liblog: support struct logger_event_v2 format
  liblog: update timestamp on NOTICE file
  libcutils: resolve warning in iosched_policy.c
  liblog: Add const pedantics
  logcat: Add -T flag (-t w/o assumption of -d)
  logcat: Add logcat test suite
  liblog: Add cpu utilization test
  liblog: Add liblog test suite
  debuggerd: Support newline split in log messages
  liblog: deprecate export LOGGER ioctl definitions
  liblog: deprecate export of LOGGER_LOG_* defines
  liblog: Add README
  liblog: resolve build warning messages
  liblog: high CPU usage from logcat
  liblog: fix build again
  liblog: drop use of sys/cdefs.h
  liblog: git_master@964770 build problem
  logcat: Incorporate liblog reading API
  debuggerd: Incorporate liblog reading API
  liblog: Interface to support abstracting log read
  adb: deprecate legacy log service interface
  adb: regression from Move list.c to inlines
  liblog: whitespace cleanup
  libcutils: bug str_parms.c:str_parms_get_float().
  libcutils: UNUSED argument warnings
  libsysutils: Get rid of warnings
  libcutils: Move list.c to inlines on list.h
2014-01-28 21:09:37 +00:00
Nick Kralevich
f286938177 am 11322efd: am acd96b11: am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."
* commit '11322efdc63003ba7e2ba73dbbb2621e916a3773':
  Move restorecon and restorecon_recursive code to libselinux.
2014-01-28 21:07:13 +00:00
Nick Kralevich
11322efdc6 am acd96b11: am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."
* commit 'acd96b11189e0422fa4060bc29139fbfef5b14a8':
  Move restorecon and restorecon_recursive code to libselinux.
2014-01-28 21:04:28 +00:00
Nick Kralevich
acd96b1118 am 12db3eb6: Merge "Move restorecon and restorecon_recursive code to libselinux."
* commit '12db3eb6db3b80011043e404530012612a1d0fbf':
  Move restorecon and restorecon_recursive code to libselinux.
2014-01-28 21:02:57 +00:00
Nick Kralevich
12db3eb6db Merge "Move restorecon and restorecon_recursive code to libselinux." 2014-01-28 20:57:37 +00:00