Commit Graph

6402 Commits

Author SHA1 Message Date
Nick Kralevich 5535b05120 write_file: introduce O_NOFOLLOW, use sane mask
Don't follow symlinks when writing to a file.
Don't create world-writable files.

Bug: 10802869
Change-Id: Ifb55600d574307a535df878acb3347e02028cd30
2013-09-17 14:46:00 -07:00
jp abgrall e6e5daace5 am edeed28b: am 4a280e3d: Merge "Don\'t use control requests to read device serial numbers."
* commit 'edeed28bd397f863686ba3e5bb7479f881efc657':
  Don't use control requests to read device serial numbers.
2013-09-17 14:17:44 -07:00
jp abgrall edeed28bd3 am 4a280e3d: Merge "Don\'t use control requests to read device serial numbers."
* commit '4a280e3dbe002bb5419ec010f89cdc158244e435':
  Don't use control requests to read device serial numbers.
2013-09-17 14:16:42 -07:00
jp abgrall 4a280e3dbe Merge "Don't use control requests to read device serial numbers." 2013-09-17 21:15:12 +00:00
Mark Wachsler bd446c76f3 Don't use control requests to read device serial numbers.
Instead of sending control requests to all devices to read their serial
numbers, read the cached strings from sysfs. This fixes two problems:
1) The control requests sometimes timed out, causing devices to show up
as "????????????????", and 2) a control request could mess up devices
which were in the middle of being flashed.

Also enumerate by walking sysfs rather than devs so that we can avoid
opening host controller devices, which can be slow. On a system with 10
EHCI controllers, fastboot devices now takes 7 msec instead of 700 msec.

Change-Id: I2ad2d58b48268d7950bd279fd6a6753dc2f79514
2013-09-16 18:08:07 -04:00
Nick Kralevich b453a9aa1d am 3a0d4b34: Merge "property_service: better validate property names" into klp-dev
* commit '3a0d4b34816d65e21951f44e4d98a954c5c855ae':
  property_service: better validate property names
2013-09-16 10:31:12 -07:00
Nick Kralevich 3a0d4b3481 Merge "property_service: better validate property names" into klp-dev 2013-09-16 17:27:43 +00:00
Nick Kralevich 6946361421 property_service: better validate property names
Don't allow unexpected characters in property names.
Don't allow double dots in property names.

Bug: 10733330
Change-Id: I8d69740d697efb791f2f201f90989576e13bac81
2013-09-16 09:05:29 -07:00
Rom Lemarchand 5c0e6410d0 am c0ce002a: Merge "Initial libmemtrack" into klp-dev
* commit 'c0ce002ae53613f622c3bb2cae258a779e22770c':
  Initial libmemtrack
2013-09-13 13:20:54 -07:00
Rom Lemarchand c0ce002ae5 Merge "Initial libmemtrack" into klp-dev 2013-09-13 18:24:42 +00:00
Dima Zavin 969570804c am 56b93693: am 6ed51b8a: Merge "mkbootimg: support longer kernel command lines"
* commit '56b93693fa6e3c470ba48047839555ba23d6a947':
  mkbootimg: support longer kernel command lines
2013-09-13 09:45:35 -07:00
Dima Zavin e4e7fef1bc am 5951a369: am b4819e4a: Merge "init: support longer command lines"
* commit '5951a3691eb0378ec65ea2e6a2e2fe77d24c5e55':
  init: support longer command lines
2013-09-13 09:42:10 -07:00
Dima Zavin 56b93693fa am 6ed51b8a: Merge "mkbootimg: support longer kernel command lines"
* commit '6ed51b8a2d6c64a44b58230a0b53a109169edd1a':
  mkbootimg: support longer kernel command lines
2013-09-13 09:42:09 -07:00
Dima Zavin 5951a3691e am b4819e4a: Merge "init: support longer command lines"
* commit 'b4819e4adaee86884725754d4966c7b78a61fb11':
  init: support longer command lines
2013-09-13 09:38:47 -07:00
Dima Zavin 6ed51b8a2d Merge "mkbootimg: support longer kernel command lines" 2013-09-13 16:37:47 +00:00
Dima Zavin b4819e4ada Merge "init: support longer command lines" 2013-09-13 16:36:24 +00:00
Eric Laurent d9c0642c6e am 53dc297d: Merge "Add HOTWORD audio source to audio.h" into klp-dev
* commit '53dc297dd685aa7498203fddb3f85e60f2cbc7df':
  Add HOTWORD audio source to audio.h
2013-09-11 17:17:46 -07:00
Eric Laurent 53dc297dd6 Merge "Add HOTWORD audio source to audio.h" into klp-dev 2013-09-12 00:14:37 +00:00
Rom Lemarchand 342077e78d am 67b00d8b: init.rc: change mem cgroups permissions
* commit '67b00d8b2d96e8133c249bcbc0fb63c49e10e022':
  init.rc: change mem cgroups permissions
2013-09-10 17:51:44 -07:00
Rom Lemarchand 67b00d8b2d init.rc: change mem cgroups permissions
Changing mem cgroups permissions to only be accessible by root and system.

Bug: 10210529
Bug: 10210900
Change-Id: Ib4fff6f49b33013b3629d40ae98a5e2464571b2d
2013-09-10 17:41:21 -07:00
Todd Poynor ee549d256f am ff9ec2d9: healthd: perform periodic chores when awake and on battery power
* commit 'ff9ec2d9990fbf9a707df063f3d43e9169bdde16':
  healthd: perform periodic chores when awake and on battery power
2013-09-09 16:53:13 -07:00
Eric Laurent 04c12ca061 Add HOTWORD audio source to audio.h
- This is a complimentary change to the one adding this new source to
  MediaRecorder.java

Bug: 10640877.

Change-Id: Ie213e82b5a60dad2a277cef367c2f5e4df70df06
2013-09-09 15:42:31 -07:00
Todd Poynor ff9ec2d999 healthd: perform periodic chores when awake and on battery power
Monitor battery/charging status at normal awake rate when on battery
power.

Bug: 10650797
Change-Id: I914d24af4963ab9d52b03c0a2615ad653ced9b12
2013-09-09 14:49:53 -07:00
Andrew Boie d35ce3563b mkbootimg: support longer kernel command lines
We can't simply increase the value of BOOT_ARGS_SIZE since that
would break past binary compatibility; the offset of 'id' would
change. This can cause serious problems with incremental OTA updates.

Instead, define a supplemental field which stores command line
information beyond the first 512 bytes. A value of 1024 was chosen
to keep the total size of struct boot_img_hdr under the smallest
page size of 2048 bytes.

Even if the extra_cmdline field is used, the original cmdline
field is still always NULL-terminated to avoid issues with older
bootloaders that haven't been updated.

Change-Id: I887e6f1db351a5b71a61e3a03363cf8856123d74
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-09-09 13:13:33 -07:00
Andrew Boie 2e63e71f31 init: support longer command lines
The Linux kernel supports command lines up to 2048 bytes on x86,
see COMMAND_LINE_SIZE in asm/setup.h.

If any androidboot.xxxx arguments were past the 1024 byte limit
here, they were lost.

Change-Id: I6247c511a7de04109490fffa0125801d274a5501
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-09-09 13:11:34 -07:00
Colin Cross fc600e49bf Initial libmemtrack
libmemtrack is an interface to a device-specific Memory Tracker HAL
to account for memory that may not show up in the normal memory
usage tools that walk /proc/pid/maps.

Bug: 10294768
Change-Id: I436f6799898df0bf8bf29747be3bc9dea5721185
2013-09-06 18:18:35 -07:00
Colin Cross 8da6e9c717 am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."
* commit 'c9ff37144a7943ee1bc247cef3620c8cce22049d':
  fix valgrind ioctl warning.
2013-09-05 12:57:15 -07:00
Colin Cross c9ff37144a am 596e9c63: Merge "fix valgrind ioctl warning."
* commit '596e9c6314e4f2869499bcdbb816680ddb10c88f':
  fix valgrind ioctl warning.
2013-09-05 12:55:33 -07:00
Colin Cross 596e9c6314 Merge "fix valgrind ioctl warning." 2013-09-05 19:54:31 +00:00
Ben Cheng 61e4b4d5a8 am 8fb85b37: am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."
* commit '8fb85b37af1753ce6bc5d88a04485a6c805bb3a3':
  Add -Wno-unused-parameter to suppress the warning.
2013-09-04 14:08:55 -07:00
Ben Cheng 8fb85b37af am 2b2f1ae8: Merge "Add -Wno-unused-parameter to suppress the warning."
* commit '2b2f1ae86fb791e9f2fff25f93e7f2c4db010bf6':
  Add -Wno-unused-parameter to suppress the warning.
2013-09-04 14:05:40 -07:00
Ben Cheng 2b2f1ae86f Merge "Add -Wno-unused-parameter to suppress the warning." 2013-09-04 21:03:05 +00:00
Ben Cheng c665df33e0 Add -Wno-unused-parameter to suppress the warning.
For example in system/core/libcorkscrew/arch-arm/backtrace-arm.c:

system/core/libcorkscrew/arch-arm/backtrace-arm.c:555:49: error: unused
parameter 'siginfo' [-Werror=unused-parameter]

Change-Id: Ibe13e8761a2f57324c0f0d87d9add549a20aa37a
2013-09-04 13:51:36 -07:00
Colin Cross d64df29699 am 9dd40e97: am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"
* commit '9dd40e9756de23a25aaa9909c8d4055105621a76':
  [GNSS] Add AID_GPS to property user white list
2013-09-03 17:13:35 -07:00
Colin Cross 9dd40e9756 am d171b656: Merge "[GNSS] Add AID_GPS to property user white list"
* commit 'd171b6567023f7f840b3a145ec27b5723750dc18':
  [GNSS] Add AID_GPS to property user white list
2013-09-03 17:11:41 -07:00
Colin Cross d171b65670 Merge "[GNSS] Add AID_GPS to property user white list" 2013-09-04 00:09:30 +00:00
Nick Kralevich a9f6cc54e7 am f487e07b: am 53132840: Merge "init: call restorecon on /sys"
* commit 'f487e07bce49735235b91bf5ee79b6987ff80188':
  init: call restorecon on /sys
2013-09-03 16:47:46 -07:00
Nick Kralevich 164a517bc8 am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"
* commit '49382f12f2e8278a02019d78482df00bb7f7fad7':
  init: allow disabling selinux via a kernel command line
2013-09-03 16:47:45 -07:00
Nick Kralevich a46286db34 am 5fc1acfa: (-s ours) am b2423399: Merge "init: move SELinux into enforcing mode."
* commit '5fc1acfaabd5de3a8043d0950e4946dda7b6d5c3':
  init: move SELinux into enforcing mode.
2013-09-03 16:47:45 -07:00
Nick Kralevich f487e07bce am 53132840: Merge "init: call restorecon on /sys"
* commit '531328400ed6ce513f9bb4d9d772f02affeeaa26':
  init: call restorecon on /sys
2013-09-03 16:43:01 -07:00
Nick Kralevich 49382f12f2 am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"
* commit '8328edb0a7d9f6eb3af82ea8bcda8bf15ffd75ab':
  init: allow disabling selinux via a kernel command line
2013-09-03 16:43:00 -07:00
Nick Kralevich 5fc1acfaab am b2423399: Merge "init: move SELinux into enforcing mode."
* commit 'b2423399883094ad1a1ddf7e02d798fd72a283a9':
  init: move SELinux into enforcing mode.
2013-09-03 16:42:59 -07:00
Nick Kralevich 531328400e Merge "init: call restorecon on /sys" 2013-09-03 23:41:26 +00:00
Nick Kralevich 8328edb0a7 Merge "init: allow disabling selinux via a kernel command line" 2013-09-03 23:41:19 +00:00
Nick Kralevich b242339988 Merge "init: move SELinux into enforcing mode." 2013-09-03 23:41:09 +00:00
Nick Kralevich ae76f6dbcf init: call restorecon on /sys
Not all files on /sys are not getting labeled properly. Fix them.

Change-Id: I9dcff76354e7f50d41f1b6e702836cfbbc149278
2013-09-03 15:55:58 -07:00
Nick Kralevich 935bd3e315 init: allow disabling selinux via a kernel command line
Create a new "androidboot.selinux" option, to control how userspace
handles SELinux. This kernel command line can have three options:

* disabled
* permissive
* enforcing

"disabled" completely disables userspace support for SELinux. No
policy is ever loaded, nor is the SELinux filesystem /sys/fs/selinux
ever mounted.

"permissive" loads the SELinux policy, but puts SELinux into
permissive mode. SELinux policy violations are logged, but not rejected.

"enforcing", the default, loads the SELinux policy, and places
SELinux into enforcing mode. Policy violations are rejected.

This change addresses post review comments for change
b710ed21de .

Change-Id: I912583db8e6a0e9c63380de32ad8ffc47a8a440f
2013-09-03 15:55:00 -07:00
Nick Kralevich 56fa0ac6b6 init: move SELinux into enforcing mode.
When init starts up, immediately put SELinux into enforcing mode.

This is currently a no-op. We currently have everything in the
unconfined domain, so this should not break anything.
(if it does, I'll roll it back immediately)

If the kernel doesn't have SELinux support compiled in, then
don't try loading a policy and continue without SELinux protections.

Change-Id: Id0279cf82c545ea0f7090137b7566a5bc3ddd641
2013-09-03 15:54:15 -07:00
Lorenzo Colitti 6324776b3e am f3486134: Switch back to subsystem "net" for netlink events.
* commit 'f34861346d5c207912075fba9874090e4c947869':
  Switch back to subsystem "net" for netlink events.
2013-09-02 18:09:21 -07:00
Lorenzo Colitti f34861346d Switch back to subsystem "net" for netlink events.
The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".

Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.

Bug: 10433320
Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
2013-09-03 00:25:14 +09:00