diff --git a/debuggerd/NOTICE b/debuggerd/NOTICE deleted file mode 100644 index c5b1efa7a..000000000 --- a/debuggerd/NOTICE +++ /dev/null @@ -1,190 +0,0 @@ - - Copyright (c) 2005-2008, The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - diff --git a/debuggerd/signal_sender.cpp b/debuggerd/signal_sender.cpp deleted file mode 100644 index 42a8e7717..000000000 --- a/debuggerd/signal_sender.cpp +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "debuggerd-signal" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "signal_sender.h" - -static int signal_fd = -1; -static pid_t signal_pid; -struct signal_message { - pid_t pid; - pid_t tid; - int signal; -}; - -static void set_signal_sender_process_name() { -#if defined(__LP64__) - static constexpr char long_process_name[] = "debuggerd64:signaller"; - static constexpr char short_process_name[] = "debuggerd64:sig"; - static_assert(sizeof(long_process_name) <= sizeof("/system/bin/debuggerd64"), ""); -#else - static constexpr char long_process_name[] = "debuggerd:signaller"; - static constexpr char short_process_name[] = "debuggerd:sig"; - static_assert(sizeof(long_process_name) <= sizeof("/system/bin/debuggerd"), ""); -#endif - - // pthread_setname_np has a maximum length of 16 chars, including null terminator. - static_assert(sizeof(short_process_name) <= 16, ""); - pthread_setname_np(pthread_self(), short_process_name); - - char* progname = const_cast(getprogname()); - if (strlen(progname) <= strlen(long_process_name)) { - ALOGE("debuggerd: unexpected progname %s", progname); - return; - } - - memset(progname, 0, strlen(progname)); - strcpy(progname, long_process_name); -} - -// Fork a process to send signals for the worker processes to use after they've dropped privileges. -bool start_signal_sender() { - if (signal_pid != 0) { - ALOGE("debuggerd: attempted to start signal sender multiple times"); - return false; - } - - int sfd[2]; - if (socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sfd) != 0) { - ALOGE("debuggerd: failed to create socketpair for signal sender: %s", strerror(errno)); - return false; - } - - pid_t parent = getpid(); - pid_t fork_pid = fork(); - if (fork_pid == -1) { - ALOGE("debuggerd: failed to initialize signal sender: fork failed: %s", strerror(errno)); - return false; - } else if (fork_pid == 0) { - close(sfd[1]); - - set_signal_sender_process_name(); - - while (true) { - signal_message msg; - int rc = TEMP_FAILURE_RETRY(read(sfd[0], &msg, sizeof(msg))); - if (rc < 0) { - ALOGE("debuggerd: signal sender failed to read from socket"); - break; - } else if (rc != sizeof(msg)) { - ALOGE("debuggerd: signal sender read unexpected number of bytes: %d", rc); - break; - } - - // Report success after sending a signal - int err = 0; - if (msg.tid > 0) { - if (syscall(SYS_tgkill, msg.pid, msg.tid, msg.signal) != 0) { - err = errno; - } - } else { - if (kill(msg.pid, msg.signal) != 0) { - err = errno; - } - } - - if (TEMP_FAILURE_RETRY(write(sfd[0], &err, sizeof(err))) < 0) { - ALOGE("debuggerd: signal sender failed to write: %s", strerror(errno)); - } - } - - // Our parent proably died, but if not, kill them. - if (getppid() == parent) { - kill(parent, SIGKILL); - } - _exit(1); - } else { - close(sfd[0]); - signal_fd = sfd[1]; - signal_pid = fork_pid; - return true; - } -} - -bool stop_signal_sender() { - if (signal_pid <= 0) { - return false; - } - - if (kill(signal_pid, SIGKILL) != 0) { - ALOGE("debuggerd: failed to kill signal sender: %s", strerror(errno)); - return false; - } - - close(signal_fd); - signal_fd = -1; - - int status; - waitpid(signal_pid, &status, 0); - signal_pid = 0; - - return true; -} - -bool send_signal(pid_t pid, pid_t tid, int signal) { - if (signal_fd == -1) { - ALOGE("debuggerd: attempted to send signal before signal sender was started"); - errno = EHOSTUNREACH; - return false; - } - - signal_message msg = {.pid = pid, .tid = tid, .signal = signal }; - if (TEMP_FAILURE_RETRY(write(signal_fd, &msg, sizeof(msg))) < 0) { - ALOGE("debuggerd: failed to send message to signal sender: %s", strerror(errno)); - errno = EHOSTUNREACH; - return false; - } - - int response; - ssize_t rc = TEMP_FAILURE_RETRY(read(signal_fd, &response, sizeof(response))); - if (rc == 0) { - ALOGE("debuggerd: received EOF from signal sender"); - errno = EHOSTUNREACH; - return false; - } else if (rc < 0) { - ALOGE("debuggerd: failed to receive response from signal sender: %s", strerror(errno)); - errno = EHOSTUNREACH; - return false; - } - - if (response == 0) { - return true; - } - - errno = response; - return false; -} diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 21f24f27b..f75036d36 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -62,7 +62,6 @@ SANITIZE_ASAN_OPTIONS_FOR := \ cameraserver \ cnd \ debuggerd \ - debuggerd64 \ dex2oat \ drmserver \ fingerprintd \