| Révision | 952d62246c914bd5f5b5a8d2bff4aab69d90966e (tree) |
|---|---|
| l'heure | 2020-05-20 23:03:42 |
| Auteur | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'lineage/cm-14.1' into cm-14.1-x86
Conflicts:
init/service.cpp
include/utils/Flattenable.h (diff)
init/service.cpp (diff)| @@ -19,6 +19,7 @@ | ||
| 19 | 19 | |
| 20 | 20 | |
| 21 | 21 | #include <stdint.h> |
| 22 | +#include <string.h> | |
| 22 | 23 | #include <sys/types.h> |
| 23 | 24 | #include <utils/Errors.h> |
| 24 | 25 | #include <utils/Debug.h> |
| @@ -44,7 +45,12 @@ public: | ||
| 44 | 45 | |
| 45 | 46 | template<int N> |
| 46 | 47 | static size_t align(void*& buffer) { |
| 47 | - return align<N>( const_cast<void const*&>(buffer) ); | |
| 48 | + static_assert(!(N & (N - 1)), "Can only align to a power of 2."); | |
| 49 | + void* b = buffer; | |
| 50 | + buffer = reinterpret_cast<void*>((uintptr_t(buffer) + (N-1)) & ~(N-1)); | |
| 51 | + size_t delta = size_t(uintptr_t(buffer) - uintptr_t(b)); | |
| 52 | + memset(b, 0, delta); | |
| 53 | + return delta; | |
| 48 | 54 | } |
| 49 | 55 | |
| 50 | 56 | static void advance(void*& buffer, size_t& size, size_t offset) { |
| @@ -373,11 +373,11 @@ bool Service::Start() { | ||
| 373 | 373 | } |
| 374 | 374 | if (rc == 0 && scon == mycon) { |
| 375 | 375 | ERROR("Service %s does not have a SELinux domain defined.\n", name_.c_str()); |
| 376 | -#if 0 | |
| 377 | - free(mycon); | |
| 378 | - free(fcon); | |
| 379 | - return false; | |
| 380 | -#endif | |
| 376 | + if (selinux_status_getenforce() > 0) { | |
| 377 | + free(mycon); | |
| 378 | + free(fcon); | |
| 379 | + return false; | |
| 380 | + } | |
| 381 | 381 | } |
| 382 | 382 | free(mycon); |
| 383 | 383 | free(fcon); |
Android-x86
Fork