Commit Graph

6402 Commits

Author SHA1 Message Date
Benoit Goby 4820022b5e am 0b7d588d: am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"
* commit '0b7d588d531691904530ba57d772b31fb24ed343':
  init: Fix queue_all_property_triggers with nonexistent properties
2013-09-24 16:15:43 -07:00
Benoit Goby 0b7d588d53 am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"
* commit 'f2c4c4ada725b86e6581a89cc06e2836d4bdc6e3':
  init: Fix queue_all_property_triggers with nonexistent properties
2013-09-24 16:13:17 -07:00
Benoit Goby f2c4c4ada7 Merge "init: Fix queue_all_property_triggers with nonexistent properties" 2013-09-24 23:10:44 +00:00
Ben Cheng bcea352d2c am d38cc182: Merge "Disable timestamp logging." into klp-dev
* commit 'd38cc182dbfce4a1d7e8e9c16bff10b71128cc01':
  Disable timestamp logging.
2013-09-24 15:44:12 -07:00
Ben Cheng d38cc182db Merge "Disable timestamp logging." into klp-dev 2013-09-24 22:39:11 +00:00
Benoit Goby d679e1b572 init: Fix queue_all_property_triggers with nonexistent properties
Don't queue actions for "on property=*" if the property does not exist.
This fixes these errors on boot:

    init: property 'sys.powerctl' doesn't exist while
    expanding '${sys.powerctl}'
    init: powerctl: cannot expand '${sys.powerctl}

Change-Id: I3bd354d73a860f856be5df2c654f940445f9efd9
2013-09-24 15:20:34 -07:00
Rom Lemarchand b5ffadedd4 am 397a3642: fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
* commit '397a3642145dbd0919f8148ff24f0cafe1714b55':
  fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
2013-09-24 10:57:33 -07:00
Rom Lemarchand 397a364214 fs_mgr: check that fstab is not NULL in fs_mgr_free_fstab
Make sure fstab is not NULL before freeing it

Bug: 10911605
Change-Id: I549c0a470dd183fb15a2f3c5cf4f3dd393b6e307
2013-09-24 10:49:46 -07:00
Ben Cheng 5cd118178e Disable timestamp logging.
The kernel problem has been fixed long time ago and the ad-hoc logging
mechanism is not thread safe and can flood the log with spurious
messages.

BUG: 10899829
Change-Id: I63278db51295e744eed3e47dc8d4cfe621c0d8f7
2013-09-23 22:39:15 -07:00
Ken Sumrall dfcbf02bb0 am 6b1a0272: Merge "Create a separate copy of the fsck logs" into klp-dev
* commit '6b1a027239689a817aa5ca44a2bcbfe48ed21408':
  Create a separate copy of the fsck logs
2013-09-23 18:59:39 -07:00
Ken Sumrall 12d7192586 am 777a00e3: Merge "New fstab flags to support more expressive SD card permissions" into klp-dev
* commit '777a00e3d193e45d928b1a26de85ae5a238271c4':
  New fstab flags to support more expressive SD card permissions
2013-09-23 18:59:39 -07:00
Ken Sumrall 6b1a027239 Merge "Create a separate copy of the fsck logs" into klp-dev 2013-09-23 20:06:57 +00:00
Ken Sumrall 777a00e3d1 Merge "New fstab flags to support more expressive SD card permissions" into klp-dev 2013-09-23 20:06:41 +00:00
Jeff Sharkey 500f3ffad4 am 0ee7d8c6: Fix Mac builds, for realz.
* commit '0ee7d8c68b57c02d02f707d6f71c731234d56eec':
  Fix Mac builds, for realz.
2013-09-20 18:04:53 -07:00
Jeff Sharkey 0ee7d8c68b Fix Mac builds, for realz.
Change-Id: I63e21b90e5b8a8f016dd04ceca4354793faa5e37
2013-09-20 18:00:15 -07:00
Ken Sumrall 4eaf905858 Create a separate copy of the fsck logs
The log_target parameter of android_fork_execvp_ext() is now a
bit field, and multiple targets can be set to log to multiple
places at the same time.

The new target LOG_FILE will log to a file specified by the new
parameter file_path.

Set LOG_FILE and log to a file in /dev (the only writable filesystem
avilable when e2fsck runs) when invoking e2fsck in fs_mgr.

Bug: 10021342

Change-Id: I63baf644cc8c3afccc8345df27a74203b44d0400
2013-09-20 17:44:33 -07:00
Ken Sumrall 887f289206 New fstab flags to support more expressive SD card permissions
Bug: 10330128

Change-Id: I41fb178b839487b604762fbc1ccba097d25c7aa0
2013-09-20 17:43:52 -07:00
Jeff Sharkey 68955fc82e am 4481c325: Fix Mac builds.
* commit '4481c325b16d4a42fd0ebf4c8a2bb5bcc09daf5e':
  Fix Mac builds.
2013-09-20 17:39:27 -07:00
Jeff Sharkey 4481c325b1 Fix Mac builds.
Change-Id: I0eb029395a3afd2f93a7632d7d3d20d28c2ab189
2013-09-20 17:35:15 -07:00
Jeff Sharkey 9729b41574 am 44d6342c: Remove mkdir() side effect, add .nomedia, utils.
* commit '44d6342caa0db1f613809e9ba1ea8d9af0183b74':
  Remove mkdir() side effect, add .nomedia, utils.
2013-09-20 15:57:58 -07:00
Jeff Sharkey 44d6342caa Remove mkdir() side effect, add .nomedia, utils.
Before this change, FUSE lookup() would have the side effect of
creating the directory on behalf of apps.  This resulted in most
directories being created just by Settings trying to measure disk
space.  Instead, we're switching to have vold do directory creation
when an app doesn't have enough permissions.

Create fs_mkdirs() utility to create all parent directories in a
path as needed.  Allow traversal (+x) into /storage directories.

Fix FUSE derived permissions to be case insensitive.  Mark well-known
directories as .nomedia when created.

Bug: 10577808, 10330221
Change-Id: I53114f2e63ffbe6de4ba6a72d94a232523231cad
2013-09-20 14:21:09 -07:00
Elliott Hughes 4d5d633bf8 am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
* commit '20eb7ac26435abb1b2514951eee07fee44773877':
  libsparse: Use BIONIC implementation of mmap64()
2013-09-19 14:30:57 -07:00
Elliott Hughes 20eb7ac264 am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"
* commit '3c8bdef029cbaa8d8fa18e4e55e51b60e938dd6e':
  libsparse: Use BIONIC implementation of mmap64()
2013-09-19 14:25:01 -07:00
Elliott Hughes 3c8bdef029 Merge "libsparse: Use BIONIC implementation of mmap64()" 2013-09-19 21:22:47 +00:00
Nick Kralevich 1998e505a9 am 2e940286: am 0f507339: Merge "Do not change ownership of /sys/fs/selinux/load to system UID."
* commit '2e9402863b40fe8bf2ddd8169c62f2419d968ff9':
  Do not change ownership of /sys/fs/selinux/load to system UID.
2013-09-19 08:51:49 -07:00
Nick Kralevich 2e9402863b am 0f507339: Merge "Do not change ownership of /sys/fs/selinux/load to system UID."
* commit '0f507339ec474a2f67227466efc9045630f1f1a4':
  Do not change ownership of /sys/fs/selinux/load to system UID.
2013-09-19 08:50:21 -07:00
Nick Kralevich 0f507339ec Merge "Do not change ownership of /sys/fs/selinux/load to system UID." 2013-09-19 15:47:53 +00:00
Stephen Smalley cc13e8ab87 Do not change ownership of /sys/fs/selinux/load to system UID.
Policy reload is handled by setting the selinux.reload_policy property
and letting the init process perform the actual loading of policy into
the kernel.  Thus, there should be no need for the system UID to directly
write to /sys/fs/selinux/load.

Change-Id: I240c5bb2deaee757a2e1e396e14dea9e5d9286f5
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-09-19 11:26:26 -04:00
Elliott Hughes a2a93250f6 am c67bd8d7: am a208ea63: Merge "Fix fstab memory leak"
* commit 'c67bd8d7cd9b43a5a5ef249ea787ac9786359d22':
  Fix fstab memory leak
2013-09-18 16:38:14 -07:00
Elliott Hughes c67bd8d7cd am a208ea63: Merge "Fix fstab memory leak"
* commit 'a208ea6301b3a7141f800d21407b0befa8ad0a56':
  Fix fstab memory leak
2013-09-18 16:36:33 -07:00
Elliott Hughes a208ea6301 Merge "Fix fstab memory leak" 2013-09-18 23:35:01 +00:00
Irina Tirdea d431b8d7f1 Fix fstab memory leak
When reading the fstab config file fails, fstab memory is not freed.
When fstab structure is no longer needed, only half of it is freed.

Free fstab memory in all cases (error or when it is no longer needed).

Change-Id: Ib0758a5aaa69505285bf64143632986a2dbbdccb
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2013-09-18 16:34:02 -07:00
Elliott Hughes 9f25b565f7 am c4295d9b: am 810ff696: Merge "Cleanup fs_getline from fs_mgr"
* commit 'c4295d9b72812afbaebd7f2512c7a5bba9e7d5fa':
  Cleanup fs_getline from fs_mgr
2013-09-18 16:33:55 -07:00
Elliott Hughes c4295d9b72 am 810ff696: Merge "Cleanup fs_getline from fs_mgr"
* commit '810ff69609c6f6e0a562c8f05912d4d785fd8bd2':
  Cleanup fs_getline from fs_mgr
2013-09-18 16:31:12 -07:00
Elliott Hughes 810ff69609 Merge "Cleanup fs_getline from fs_mgr" 2013-09-18 23:26:50 +00:00
Colin Cross 54aad02661 am 8dc82eea: am 36b39a97: Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"
* commit '8dc82eea7ebda374830ee7fa1802222a94eefd88':
  init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
2013-09-18 16:04:22 -07:00
Mathias Agopian a512c1ca63 am 7b445a8e: Merge "Fix rotation in camera2 API" into klp-dev
* commit '7b445a8e3a21055a5735585ca0890d14977032f0':
  Fix rotation in camera2 API
2013-09-18 15:33:40 -07:00
Mathias Agopian 7b445a8e3a Merge "Fix rotation in camera2 API" into klp-dev 2013-09-18 22:31:28 +00:00
Daniel Leung fccfa414c9 libsparse: Use BIONIC implementation of mmap64()
Change-Id: I63692629d3a62b7aee21202b67241904b1cc9789
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
2013-09-18 14:42:28 -07:00
Colin Cross 8dc82eea7e am 36b39a97: Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"
* commit '36b39a97f3fc5790538e2e69429043b78ba486e4':
  init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
2013-09-18 14:40:29 -07:00
Colin Cross 36b39a97f3 Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output" 2013-09-18 21:38:33 +00:00
Irina Tirdea e16d747b51 Cleanup fs_getline from fs_mgr
Since getline is included in bionic, fs_mgr can use this version instead of
the one defined internally by fs_getline.

Replace fs_getline with getline.

Change-Id: I49b53d639bd995f051256fb7573ff6ab45d9c36d
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2013-09-18 22:55:51 +03:00
Nick Kralevich 0e7bd81c93 am 4f18183b: Merge "Initialize /dev/urandom earlier in boot." into klp-dev
* commit '4f18183bd6d3d2ed5d698c176ecc239211bdb82e':
  Initialize /dev/urandom earlier in boot.
2013-09-18 12:50:32 -07:00
Nick Kralevich 4f18183bd6 Merge "Initialize /dev/urandom earlier in boot." into klp-dev 2013-09-18 19:46:54 +00:00
Jamie Gennis 3929efb9d4 am 9d773b97: Merge "trace: Add support for tracing 64-bit ints." into klp-dev
* commit '9d773b978b9fc26fb08a973e0290aba5432b720a':
  trace: Add support for tracing 64-bit ints.
2013-09-18 12:21:23 -07:00
Jamie Gennis 9d773b978b Merge "trace: Add support for tracing 64-bit ints." into klp-dev 2013-09-18 19:17:58 +00:00
Jamie Gennis f1921c7949 trace: Add support for tracing 64-bit ints.
Bug: 10624956
Change-Id: Ie1d7c8ac16b5a5ec1e63e4fb1863f5b1ab2b59e8
2013-09-18 19:03:45 +00:00
Nick Kralevich b410eb1913 Initialize /dev/urandom earlier in boot.
It's a security best practice to carry entropy across reboots.
(see "man 4 random"). Currently, entropy saving and mixing occur
in the system_server, via the EntropyMixer code. Unfortunately, the
EntropyMixer code runs fairly late in the boot process, which means
early boot doesn't have high quality entropy. This has caused security
problems in the past.

Load entropy data as soon as we can in the early boot process, so that
we can get /dev/random / /dev/urandom into a "random" state earlier.

Bug: 9983133
Change-Id: Id4a6f39e9060f30fe7497bd8f8085a9bec851e80
2013-09-18 07:53:51 -07:00
Mathias Agopian 96675ed91f Fix rotation in camera2 API
Bug: 10804238
Change-Id: I093945789d9c6d373392fc9dfd18ec2c6058d3b9
2013-09-17 23:48:54 -07:00
Nick Kralevich 18c34183d7 am 5535b051: write_file: introduce O_NOFOLLOW, use sane mask
* commit '5535b05120fa3fd3d68a09e01284aba35cc6e058':
  write_file: introduce O_NOFOLLOW, use sane mask
2013-09-17 15:04:45 -07:00