Commit graph

4835 commits

Author SHA1 Message Date
Kenny Root
a69af5af3d Merge "Track change to JSSE provider" 2013-04-30 04:01:39 +00:00
Kenny Root
ca0404b83e Track change to JSSE provider
Change-Id: Iff9103fff3591983f2b172f83fd2a6e924986aa7
2013-04-29 14:20:43 -07:00
Nick Kralevich
5ea5854315 Merge "mount: fix incorrect string length calculation" 2013-04-24 23:38:46 +00:00
Nick Kralevich
29a5298366 mount: fix incorrect string length calculation
Fix bug https://code.google.com/p/android/issues/detail?id=54192
which incorrectly calculated the length of a string.

Fix compiler warning:

system/core/toolbox/mount.c:59:2: warning: initializer-string for array of chars is too long [enabled by default]
system/core/toolbox/mount.c:59:2: warning: (near initialization for 'options[16].str') [enabled by default]

Change-Id: If8663f8311c6348a730fcf731d402b57fee10cb5
2013-04-24 16:31:02 -07:00
Elliott Hughes
cb6a842c6e Merge "Add a stack overflow test to crasher, and document all the options." 2013-04-24 01:27:41 +00:00
Elliott Hughes
3808c4ecb4 Add a stack overflow test to crasher, and document all the options.
Change-Id: Iebe80c24ef43f08d258881e7847516d414436931
2013-04-23 17:14:56 -07:00
Colin Cross
b73a0ef4d0 Merge "use lseek64 to resolve offset oveflow" 2013-04-18 20:25:18 +00:00
Colin Cross
d7cab8bff1 Merge "adb : add missing connection states" 2013-04-17 21:45:45 +00:00
Jongrak Kwon
c05aae4ac4 use lseek64 to resolve offset oveflow
The offset variable in lseek is 32 bit and get easily overflow
when accessing with large offset in dd command.
Use lseek64 to resolve it.

Change-Id: Ib75d9dcb587004a6851365ab5bb8584ce1010b57
2013-04-17 14:05:55 -07:00
Elliott Hughes
ffc5a4a529 Merge "Add OUYA VID to known VID list" 2013-04-17 16:20:42 +00:00
Al Sutton
21ec0516cf Add OUYA VID to known VID list
Add the OUYA VID to the list of known USB VIDs to allow developers with OUYA
consoles to have their device automatically recognized.

Change-Id: I499114d8071747b972c24681fc0771f000ad9f9d
2013-04-17 09:20:05 -07:00
trevd
a5ad539cff adb : add missing connection states
Both CS_RECOVERY and CS_SIDELOAD where not being checked by
connection_state_name which resulted in adb get-state returning
unknown when a device is in those modes.

Change-Id: I00716024d6a0bdb68d6e2380c8cd7b5d056bd15f
Signed-off-by: trevd <trevd1234@gmail.com>
2013-04-17 14:34:23 +01:00
Colin Cross
578b74734c Merge "libsparse: Fix null pointer issue" 2013-04-06 19:03:02 +00:00
Colin Cross
6e0b9ecb50 Merge "toolbox/dmesg: do not hardcode KLOG_BUF_LEN" 2013-04-06 19:02:01 +00:00
Colin Cross
1615c09ac1 Merge "init: Fix potential null pointer issue" 2013-04-06 01:53:24 +00:00
Elliott Hughes
f79c05186f Merge "Modify debuggerd to cope with the abort message." 2013-04-05 18:27:38 +00:00
Keun-young Park
ad999a09ab Merge "rootdir: goldfish: mount debugfs on boot time" 2013-04-05 16:19:20 +00:00
Geremy Condra
911ba269e3 Merge "Add -i option to toolbox cmd ls" 2013-04-05 00:08:19 +00:00
Elliott Hughes
707b8bbe18 Modify debuggerd to cope with the abort message.
Bug: 8531731
Change-Id: I416ec1da38a8a1b0d0a582ccd7c8aaa681ed4a29
2013-04-04 13:52:01 -07:00
William Roberts
403b195548 Add -i option to toolbox cmd ls
Change-Id: I4690fc10dc07bf1883bcf8ec18399235dc97d317
2013-04-03 17:39:19 -07:00
Brian Carlstrom
02e8d73079 Merge "Add OkHttp to the boot classpath." 2013-04-03 20:15:20 +00:00
jwilson
8637e8186a Add OkHttp to the boot classpath.
Change-Id: I185b803b5b804ff8680ef928ce5163727adbf0bd
2013-04-02 16:23:48 -07:00
James Sullins
edee93dc5b toolbox/dmesg: do not hardcode KLOG_BUF_LEN
Change-Id: Ia99654a53d6adfeba5a5088b7cff45c6e47b6188
2013-04-01 21:50:03 +05:30
Hong-Mei Li
83a6d36d42 libsparse: Fix null pointer issue
Fix the issue that "out" pointer is dereferenced without checking.

Change-Id: I76a57ad7309841218231346f4807ef2be8628737
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
2013-04-01 11:22:50 +08:00
Hong-Mei Li
11467189bc init: Fix potential null pointer issue
With the old strdup() mechanism, it may return NULL if insufficient memory was
available. So we check the return value or do not use strdup to avoid null
pointer issue.

Change-Id: Id684948d6cb6c2f06327f29a2ba692f9542fce80
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
2013-04-01 11:17:51 +08:00
Colin Cross
f5562cb66c Merge "adb: Remove execute permission on usb_vendor.c" 2013-03-29 23:43:13 +00:00
Benoit Goby
f8cfa8a1e4 adb: Remove execute permission on usb_vendor.c
Change-Id: Ia4f2e0171634764bde3593593b3c99184236528f
2013-03-29 16:33:02 -07:00
Colin Cross
352004220a Merge changes I0694ed72,I9f0622e0,Ib8c5196c
* changes:
  Add BYD's USB Vendor ID
  Add USB Vendor ID for Xiaomi
  Add vendor IDs to adb
2013-03-29 22:18:06 +00:00
sunxiaoqi
92eb583833 Add BYD's USB Vendor ID
Change-Id: I0694ed72d70638f0a4a252b1c802ae8f4e33385e
2013-03-29 14:57:44 -07:00
Gary Hua
d3b69404a1 Add USB Vendor ID for Xiaomi
Change-Id: I9f0622e05334a5074604bd88093172654b4c3e7d
Signed-off-by: Gary Hua <huachengping@xiaomi.com>
2013-03-29 14:56:53 -07:00
Sam Lin
df6d7666fd Add vendor IDs to adb
Adding vendor IDs to adb for device partners:
  AnyDATA, Harris & Oppo

Change-Id: Ib8c5196c53599bd6eb077871cd95ccac935c42e7
2013-03-29 14:51:15 -07:00
Keun-young Park
9b32f87a8c Merge "Add Mips memset speedup" 2013-03-29 21:05:23 +00:00
Nick Kralevich
191fe44c97 Merge "run-as: Don't require CAP_DAC_READ_SEARCH" 2013-03-29 16:24:06 +00:00
Nick Kralevich
b0f1540f2a run-as: Don't require CAP_DAC_READ_SEARCH
This is a partial AOSP port of Google internal change
080427e4e2 .

Change-Id: I23a7edc808d227caf3862b035dc2ca39639d9d59
2013-03-29 08:55:06 -07:00
Geremy Condra
c8df252fa1 Merge "run-as: Get seinfo from packages.list and pass to libselinux." 2013-03-28 20:30:57 +00:00
Robert Craig
fced3ded83 run-as: Get seinfo from packages.list and pass to libselinux.
Change allows the proper seinfo value to be passed
to libselinux to switch to the proper app security
context before running the shell.

Change-Id: I9d7ea47c920b1bc09a19008345ed7fd0aa426e87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-03-28 06:04:39 -04:00
Geremy Condra
c0e1bc1c75 Merge "Drop /data/system as a policy file location" 2013-03-27 22:39:47 +00:00
William Roberts
04561b6347 Drop /data/system as a policy file location
/data/system is no longer used as a policy
file location. Use /data/security instead.

Change-Id: Ie77be9e25c67c8a2157c7b6c468f3215a49ead52
2013-03-26 23:33:18 +00:00
Geremy Condra
e849970c54 Merge "Fix mode on /data/security." 2013-03-23 02:47:16 +00:00
Stephen Smalley
c0317a7579 Fix mode on /data/security.
Change-Id: Id97d06a1c360c7871361db147f76b8a2eaceca42
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-03-21 14:25:16 -04:00
Geremy Condra
028e38f691 Merge "Create a new location for /data policy files" 2013-03-21 05:40:26 +00:00
William Roberts
46e1bd89b4 Create a new location for /data policy files
Adding a new location for policy files under
/data, the new location is /data/security. The
new location is used before attempting to use
any other location.
This requires a new directory to be created by
the init script and an update to the location of
the property_contexts file for property service.

Change-Id: I955a722ac3e51fa6c1b97201b8bdef3f601cf09d
2013-03-20 19:34:55 -07:00
Elliott Hughes
55e1df471b Merge "debuggerd: Fix minor memory leak" 2013-03-20 17:04:44 +00:00
Liangtao Gao
0632ad4577 debuggerd: Fix minor memory leak
free_ptrace_context(context) doesn't free(context),
which leaks the memory allocated to context.

Change-Id: Ic199b257aefc9a05ec2d902958efa8a57a601fb1
Signed-off-by: Liangtao Gao <gliangtao@gmail.com>
2013-03-20 10:00:58 -07:00
Nick Kralevich
1a2bdd6fbe Merge "liblog: fix fd leakage" 2013-03-15 16:56:40 +00:00
Nick Kralevich
a170322083 liblog: fix fd leakage
File descriptors remain open across an exec unless FD_CLOEXEC is
set.  Add O_CLOEXEC to the open() call to prevent file descriptor
leakage.

In particular, the following program will eventually run out of
file descriptors:

int main(int argc, char **argv) {
  printf("===== entering main =====\n");
  ALOGW("entering main");
  system("ls -l /proc/self/fd/");

  execv(argv[0], argv);
  printf("exec failed\n");
  return -1;
}

Change-Id: I5be43ab3b9f82a05f242b1f586454c50568af388
2013-03-15 09:48:32 -07:00
Colin Cross
80dac35023 Merge "ueventd: allow platform devices to have just a /devices/ prefix" 2013-03-15 01:16:17 +00:00
Dima Zavin
f395c9237d ueventd: allow platform devices to have just a /devices/ prefix
When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
2013-03-14 18:14:32 -07:00
Elliott Hughes
0b53555894 Merge "Unwinding implementation via eh_frame sections for x86" 2013-03-14 23:32:54 +00:00
Nick Kralevich
dbf4937b5a Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."" 2013-03-14 22:28:24 +00:00