6a5db68385
The string type in the tombstone proto does not support non-UTF8 characters. Therefore, use the oct_encode function to encode the abort_message field and message field from LogMessage. Fix up stl includes, add ones that were missing and remove those not being used. Add new unit test to verify that the abort and log messages are sanitized. Bug: 279496937 Bug: 377940849 Bug: 378185483 Test: All unit tests pass. Test: Ran pbtombstone on a crash with non-UTF8 characters and verified Test: it processes properly after this change and fails before the change. Change-Id: I3554d56caf9fcbfc410b4d554f6c3b4888b37e28
124 lines
3.1 KiB
C++
124 lines
3.1 KiB
C++
/*
|
|
* Copyright 2024, 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.
|
|
*/
|
|
|
|
#include "libdebuggerd/utility_host.h"
|
|
|
|
#include <sys/prctl.h>
|
|
|
|
#include <charconv>
|
|
#include <limits>
|
|
#include <string>
|
|
|
|
#include <android-base/stringprintf.h>
|
|
|
|
using android::base::StringPrintf;
|
|
|
|
#ifndef PR_MTE_TAG_SHIFT
|
|
#define PR_MTE_TAG_SHIFT 3
|
|
#endif
|
|
|
|
#ifndef PR_MTE_TAG_MASK
|
|
#define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
|
|
#endif
|
|
|
|
#ifndef PR_MTE_TCF_ASYNC
|
|
#define PR_MTE_TCF_ASYNC (1UL << 2)
|
|
#endif
|
|
|
|
#ifndef PR_MTE_TCF_SYNC
|
|
#define PR_MTE_TCF_SYNC (1UL << 1)
|
|
#endif
|
|
|
|
#ifndef PR_PAC_APIAKEY
|
|
#define PR_PAC_APIAKEY (1UL << 0)
|
|
#endif
|
|
|
|
#ifndef PR_PAC_APIBKEY
|
|
#define PR_PAC_APIBKEY (1UL << 1)
|
|
#endif
|
|
|
|
#ifndef PR_PAC_APDAKEY
|
|
#define PR_PAC_APDAKEY (1UL << 2)
|
|
#endif
|
|
|
|
#ifndef PR_PAC_APDBKEY
|
|
#define PR_PAC_APDBKEY (1UL << 3)
|
|
#endif
|
|
|
|
#ifndef PR_PAC_APGAKEY
|
|
#define PR_PAC_APGAKEY (1UL << 4)
|
|
#endif
|
|
|
|
#ifndef PR_TAGGED_ADDR_ENABLE
|
|
#define PR_TAGGED_ADDR_ENABLE (1UL << 0)
|
|
#endif
|
|
|
|
#define DESCRIBE_FLAG(flag) \
|
|
if (value & flag) { \
|
|
desc += ", "; \
|
|
desc += #flag; \
|
|
value &= ~flag; \
|
|
}
|
|
|
|
static std::string describe_end(long value, std::string& desc) {
|
|
if (value) {
|
|
desc += StringPrintf(", unknown 0x%lx", value);
|
|
}
|
|
return desc.empty() ? "" : " (" + desc.substr(2) + ")";
|
|
}
|
|
|
|
std::string describe_tagged_addr_ctrl(long value) {
|
|
std::string desc;
|
|
DESCRIBE_FLAG(PR_TAGGED_ADDR_ENABLE);
|
|
DESCRIBE_FLAG(PR_MTE_TCF_SYNC);
|
|
DESCRIBE_FLAG(PR_MTE_TCF_ASYNC);
|
|
if (value & PR_MTE_TAG_MASK) {
|
|
desc += StringPrintf(", mask 0x%04lx", (value & PR_MTE_TAG_MASK) >> PR_MTE_TAG_SHIFT);
|
|
value &= ~PR_MTE_TAG_MASK;
|
|
}
|
|
return describe_end(value, desc);
|
|
}
|
|
|
|
std::string describe_pac_enabled_keys(long value) {
|
|
std::string desc;
|
|
DESCRIBE_FLAG(PR_PAC_APIAKEY);
|
|
DESCRIBE_FLAG(PR_PAC_APIBKEY);
|
|
DESCRIBE_FLAG(PR_PAC_APDAKEY);
|
|
DESCRIBE_FLAG(PR_PAC_APDBKEY);
|
|
DESCRIBE_FLAG(PR_PAC_APGAKEY);
|
|
return describe_end(value, desc);
|
|
}
|
|
|
|
std::string oct_encode(const std::string& data) {
|
|
std::string oct_encoded;
|
|
oct_encoded.reserve(data.size());
|
|
|
|
// N.B. the unsigned here is very important, otherwise e.g. \255 would render as
|
|
// \-123 (and overflow our buffer).
|
|
for (unsigned char c : data) {
|
|
if (isprint(c)) {
|
|
oct_encoded += c;
|
|
} else {
|
|
std::string oct_digits("\\\0\0\0", 4);
|
|
// char is encodable in 3 oct digits
|
|
static_assert(std::numeric_limits<unsigned char>::max() <= 8 * 8 * 8);
|
|
auto [ptr, ec] = std::to_chars(oct_digits.data() + 1, oct_digits.data() + 4, c, 8);
|
|
oct_digits.resize(ptr - oct_digits.data());
|
|
oct_encoded += oct_digits;
|
|
}
|
|
}
|
|
return oct_encoded;
|
|
}
|