diff options
author | Paul Lawrence <paullawrence@google.com> | 2023-07-11 09:06:15 -0700 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-18 04:29:37 +0000 |
commit | 6b424c3bf62d84c806cb645ce31155a2d2d9fbbc (patch) | |
tree | 6baba7328151044f116f8e1064bf572ec8d687e3 | |
parent | 5c36b7e0795007a8e44535bab3208481400654de (diff) | |
download | bionic-6b424c3bf62d84c806cb645ce31155a2d2d9fbbc.tar.gz |
Revert "Fix deadlock caused by two-threaded property controls"
This reverts commit aeddfc4aaffbeb2eded2728163bcd3ae5ee5deef.
These fixes for b/262208935 introduced a race condition. We believe the
race is fixed by ag/23879563, but at this point in the release feel that
reverting the fixes and refixing in main is the better solution
Test: Builds, boots
Bug: 283202477
Bug: 288991737
Ignore-AOSP-First: Reverting CL only in internal
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d1076eb72871c7d5c8c921bcc6fa23b1349d50d1)
Merged-In: If7e9e5f99728c2f3a18b08346b4cf3449132f920
Change-Id: If7e9e5f99728c2f3a18b08346b4cf3449132f920
-rw-r--r-- | libc/bionic/system_property_set.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/libc/bionic/system_property_set.cpp b/libc/bionic/system_property_set.cpp index 845ff27e6..bde0c1002 100644 --- a/libc/bionic/system_property_set.cpp +++ b/libc/bionic/system_property_set.cpp @@ -55,24 +55,16 @@ static const char* kServiceVersionPropertyName = "ro.property_service.version"; class PropertyServiceConnection { public: - PropertyServiceConnection(const char* name) : last_error_(0) { + PropertyServiceConnection() : last_error_(0) { socket_.reset(::socket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0)); if (socket_.get() == -1) { last_error_ = errno; return; } - // If we're trying to set "sys.powerctl" from a privileged process, use the special - // socket. Because this socket is only accessible to privileged processes, it can't - // be DoSed directly by malicious apps. (The shell user should be able to reboot, - // though, so we don't just always use the special socket for "sys.powerctl".) - // See b/262237198 for context - const char* socket = property_service_socket; - if (strcmp(name, "sys.powerctl") == 0 && - access(property_service_for_system_socket, W_OK) == 0) { - socket = property_service_for_system_socket; - } - + const char* socket = access(property_service_for_system_socket, W_OK) == 0 + ? property_service_for_system_socket + : property_service_socket; const size_t namelen = strlen(socket); sockaddr_un addr; memset(&addr, 0, sizeof(addr)); @@ -189,7 +181,7 @@ struct prop_msg { }; static int send_prop_msg(const prop_msg* msg) { - PropertyServiceConnection connection(msg->name); + PropertyServiceConnection connection; if (!connection.IsValid()) { return connection.GetLastError(); } @@ -282,7 +274,7 @@ int __system_property_set(const char* key, const char* value) { // New protocol only allows long values for ro. properties only. if (strlen(value) >= PROP_VALUE_MAX && strncmp(key, "ro.", 3) != 0) return -1; // Use proper protocol - PropertyServiceConnection connection(key); + PropertyServiceConnection connection; if (!connection.IsValid()) { errno = connection.GetLastError(); async_safe_format_log( |