summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Use TEMP_FAILURE_RETRY, always build bootchart.cpp.Elliott Hughes2015-02-046-70/+25
|/ | | | | | | | Also switch the revision parsing over to sscanf as promised. I haven't done the hardware parsing because I don't yet know whether we actually need to keep the space-stripping code. Change-Id: Ic33378345cd515cb08d00c543acf44eb72673396
* Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function ↵Elliott Hughes2015-02-041-0/+2
|\ | | | | | | returning non-void"."
| * Fix clang "ueventd.cpp:111:1: error: no return statement in function ↵Elliott Hughes2015-02-041-0/+2
|/ | | | | | returning non-void". Change-Id: I69c9e5534975bffa0fbf98ca4af50400f6b94aa0
* Merge "Build init as C++."Elliott Hughes2015-02-0420-146/+101
|\
| * Build init as C++.Elliott Hughes2015-02-0420-146/+101
| | | | | | | | | | | | This is just the minimal change to keep it building. Change-Id: I245c5b8413a1db114576c81462eb5737f5ffcef2
* | Merge "logd: logd placed into background cgroup"Mark Salyzyn2015-02-041-0/+5
|\ \ | |/ |/|
| * logd: logd placed into background cgroupMark Salyzyn2015-02-041-0/+5
|/ | | | Change-Id: I38d7be05ab77fc944a9dbef2b6575d4caa920d08
* Merge "Fix x86_64 build"Dmitriy Ivanov2015-02-041-2/+2
|\
| * Fix x86_64 buildDmitriy Ivanov2015-02-031-2/+2
| | | | | | | | Change-Id: Iaa3a641907de55b398a3bdd0bbc63cbb9d367982
* | Merge "android_reboot should take a const char*."Elliott Hughes2015-02-042-2/+2
|\ \ | |/ |/|
| * android_reboot should take a const char*.Elliott Hughes2015-02-032-2/+2
|/ | | | | | The kernel argument is actually a void*, but it's only read from. Change-Id: I305c50249bf12b7fbdea4721257aed52a0372f8d
* Merge "Add Google-style StringPrintf."Elliott Hughes2015-02-035-0/+175
|\
| * Add Google-style StringPrintf.Elliott Hughes2015-02-035-0/+175
| | | | | | | | Change-Id: If333c28b8ed047346a2dd85e591c4bedbab874cc
* | Merge "Init: Fix Clang unsupported attributes"Elliott Hughes2015-02-031-0/+6
|\ \
| * | Init: Fix Clang unsupported attributesAndreas Gampe2015-02-031-0/+6
| | | | | | | | | | | | | | | | | | Make attributes conditional on not compiling with Clang. Change-Id: Ic4e9b382308651c7b1901bfa192b6591672dc5ab
* | | Merge "Extra Win32 compatibility."Elliott Hughes2015-02-031-0/+6
|\ \ \ | |_|/ |/| |
| * | Extra Win32 compatibility.Elliott Hughes2015-02-031-0/+6
|/ / | | | | | | Change-Id: Ibc583aba580f4fc15c243f495ead44b2ce4c6e5e
* | Merge "Fix Mac build."Elliott Hughes2015-02-031-0/+2
|\ \
| * | Fix Mac build.Elliott Hughes2015-02-031-0/+2
|/ / | | | | | | | | | | | | I knew I should have created a new library that doesn't build for the Mac or Windows rather than adding to libutils... Change-Id: I7c07eaa93affb7e83d4da384f03652c39065562a
* | Merge "Add Google-style ReadFileToString and WriteStringToFile."Elliott Hughes2015-02-035-10/+138
|\ \
| * | Add Google-style ReadFileToString and WriteStringToFile.Elliott Hughes2015-02-035-10/+138
| | | | | | | | | | | | | | | Bug: 19217569 Change-Id: I64789d3fa6777ee30a324cdf00fdc275c1230e1b
* | | Merge "Remove netcfg's unused options."Elliott Hughes2015-02-033-95/+26
|\ \ \
| * | | Remove netcfg's unused options.Elliott Hughes2015-02-033-95/+26
|/ / / | | | | | | | | | | | | | | | | | | Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still seem to be used. Change-Id: I9f0b580474258fa648deb5287f98d8ec5533ca6f
* | | Merge "Revert "Remove netcfg's unused options.""Elliott Hughes2015-02-035-26/+116
|\ \ \
| * | | Revert "Remove netcfg's unused options."Elliott Hughes2015-02-035-26/+116
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f8e83054cb8a8b13ee84a4aeeaa0a2fd8debca81. Change-Id: Iede772f96ff9008277df433dcbb5f6603de65283
* | | | Merge "Init: Fix literal"Andreas Gampe2015-02-031-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Init: Fix literalAndreas Gampe2015-02-031-1/+1
|/ / / | | | | | | | | | | | | | | | This is a literal 0 implicitly converted to a NULL. Change-Id: I0573e85eb0578f938877c4bec79054081c27e661
* | | Merge "Remove netcfg's unused options."Elliott Hughes2015-02-035-116/+26
|\ \ \ | |/ /
| * | Remove netcfg's unused options.Elliott Hughes2015-02-035-116/+26
| | | | | | | | | | | | | | | | | | | | | Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still seem to be used. Change-Id: Iaf499c06b09ffe5e0925339b9cd6e502f3234a86
* | | Merge "Revert "Remove netcfg's unused options.""Elliott Hughes2015-02-035-26/+116
|\ \ \
| * | | Revert "Remove netcfg's unused options."Elliott Hughes2015-02-035-26/+116
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 24c1885bc196940f48e478a220a360118ba84bd7. Change-Id: Iaae6502e2db90d67b4275faa104cfc6a0abc65c6
* | | | Merge "Remove netcfg's unused options."Elliott Hughes2015-02-035-116/+26
|\ \ \ \ | |/ / /
| * | | Remove netcfg's unused options.Elliott Hughes2015-02-025-116/+26
| |/ / | | | | | | | | | | | | | | | | | | Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still seem to be used. Change-Id: Ie0aecf5b18bd854cfb5878b6cfdd7160c9f42526
* | | Merge "Trivial cleanup of recent changes."Elliott Hughes2015-02-033-6/+9
|\ \ \ | |_|/ |/| |
| * | Trivial cleanup of recent changes.Elliott Hughes2015-02-023-6/+9
|/ / | | | | | | | | | | | | A typo in the documentation for one, and a couple of signed/unsigned warnings in the implementation of the other. Change-Id: I8fb4b7448ac901c543dea7420aabcedf13ec1bd8
* | Merge "init: Implement 'exec' command."Elliott Hughes2015-02-036-4/+74
|\ \
| * | init: Implement 'exec' command.San Mehat2015-02-026-4/+74
|/ / | | | | | | | | | | (cherry-pick of d05ab3952ec0e38f33a0e80ce6b9eb45b0064ba4.) Change-Id: Id6d9bb32e51a0ad090ed8240cc505dc45b57b35d
* | Merge "init: Add support "&&" operator in property triggers"Elliott Hughes2015-02-035-56/+128
|\ \
| * | init: Add support "&&" operator in property triggersBadhri Jagan Sridharan2015-02-025-56/+128
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "&&" operator can now be used to test the validity of two of more properties. For example: on property:test.a=1 && property:test.b=1 setprop test.c 1 The above stub sets the test.c to 1 only when both test.a=1 and test.b=1 (cherry-pick of 162f7d797c67019a7a3f08c3b0f0ffc91d548ddc.) Change-Id: I72c19f7aa92231372a416193618ee6c7fd368141 Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
* | Merge "Add O_CLOEXEC to lots of open() calls."Nick Kralevich2015-02-028-44/+31
|\ \ | |/ |/|
| * Add O_CLOEXEC to lots of open() calls.Nick Kralevich2015-02-028-44/+31
|/ | | | | | and other related fixups. Change-Id: Ia88fb37a07ff6777d00c49800081f5a519c0c78d
* Merge "builtins.c: Don't require file open() for chmod/chown"Nick Kralevich2015-02-021-63/+8
|\
| * builtins.c: Don't require file open() for chmod/chownNick Kralevich2015-02-021-63/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42a9349dc4e98019d27d7f8d19bc6c431695d7e1 modified init's builtin chmod, chown, and mkdir calls to avoid following symlinks. This addressed a number of attacks we were seeing at the time where poorly written init scripts were following attacker supplied symlinks resulting in rooting vulnerabilities. To avoid race conditions, the previous implementation only ran fchown / fchmod on file descriptors opened with open(O_NOFOLLOW). Unfortunately, unlike the normal "chown" or "chmod" calls, this requires read or write access to the underlying file. This isn't ideal, as opening some files may have side effects, or init may not have permission to open certain files (such as when SELinux is enabled). Instead of using open(O_NOFOLLOW) + fchown(), use lchown() instead. As before, the target of the symlink won't be modified by chown. This also supports setting the ownership of symlinks. Instead of using open(O_NOFOLLOW) + fchmod(), use fchmodat(AT_SYMLINK_NOFOLLOW) instead. As before, the target of the symlink won't be modified by chmod. This change will continue to ensure that chown/chmod/mkdir doesn't follow symlinks, without requiring init to open every file in read-only or read-write mode. This change depends on bionic commit I1eba0cdb2c509d9193ceecf28f13118188a3cfa7 Addresses the following mako/occam SELinux denial: audit(1422770408.951:6): avc: denied { write } for pid=1 comm="init" name="smd7" dev="tmpfs" ino=7207 scontext=u:r:init:s0 tcontext=u:object_r:radio_device:s0 tclass=chr_file Change-Id: I14fde956784d65c44e7aa91dd7eea9a004df3081
* | Merge "The bsddroid project has been dead since 2010."Elliott Hughes2015-02-023-699/+0
|\ \
| * | The bsddroid project has been dead since 2010.Elliott Hughes2015-01-313-699/+0
| | | | | | | | | | | | | | | | | | | | | And even if it wasn't, they should probably keep this stuff in their own repository. Change-Id: If9fa2e47ee2700098d8a99f6986f7e89fc6dfdf3
* | | Merge "Add close_file flag to OpenArchiveFd()"Dmitriy Ivanov2015-02-023-6/+33
|\ \ \ | |_|/ |/| |
| * | Add close_file flag to OpenArchiveFd()Dmitriy Ivanov2015-01-303-6/+33
| | | | | | | | | | | | | | | | | | * We should be able to keep fd alive after CloseArchive() Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
* | | Merge "ensure /data/tombstones exists on all Android devices"Nick Kralevich2015-01-311-0/+1
|\ \ \ | |_|/ |/| |
| * | ensure /data/tombstones exists on all Android devicesNick Kralevich2015-01-301-0/+1
|/ / | | | | | | | | | | | | | | | | | | /data/tombstones is referenced by core platform code, but is not guaranteed to exist on all Android devices. Move the directory creation out of device specific files and into the core init.rc file. Bug: https://code.google.com/p/android/issues/detail?id=93207 Change-Id: I94ae5199a6a32c4fe555ca994fc4a8345e0c9690
* | Merge "Add missing includes."Elliott Hughes2015-01-303-0/+4
|\ \
generated by cgit v1.1 at 2025-02-04 11:23:07 +0000