mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-29 08:39:44 +08:00
50ed179e9a
Use BUILDFLAG(IS_*) instead of defined(OS_*).
This was generated mostly mechnically by performing the following steps:
- sed -i '' -E -e 's/defined\(OS_/BUILDFLAG(IS_/g' \
-e 's%([ !])OS_([A-Z]+)%\1BUILDFLAG(IS_\2)%g' \
$(git grep -l 'OS_'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm')
- sed -i '' -e 's/#ifdef BUILDFLAG(/#if BUILDFLAG(/' \
$(git grep -l '#ifdef BUILDFLAG('
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm')
- gsed -i -z -E -e \
's%(.*)#include "%\1#include "build/buildflag.h"\n#include "%' \
$(git grep -l 'BUILDFLAG(IS_'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm')
- Spot checks to move #include "build/buildflag.h" to the correct parts
of files.
- sed -i '' -E -e \
's%^(#include "build/buildflag.h")$%#include "build/build_config.h"\n\1%' \
$(grep -L '^#include "build/build_config.h"$'
$(git grep -l 'BUILDFLAG(IS_'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm'))
- Add “clang-format off” around tool usage messages.
- git cl format
- Update mini_chromium to 85ba51f98278 (intermediate step).
TESTING ONLY).
- for f in $(git grep -l '^#include "build/buildflag.h"$'
'**/*.c' '**/*.cc' '**/*.h' '**/*.m' '**/*.mm'); do \
grep -v '^#include "build/buildflag.h"$' "${f}" > /tmp/z; \
cp /tmp/z "${f}"; done
- git cl format
- Update mini_chromium to 735143774c5f (intermediate step).
- Update mini_chromium to f41420eb45fa (as checked in).
- Update mini_chromium to 6e2f204b4ae1 (as checked in).
For ease of review and inspection, each of these steps is uploaded as a
new patch set in a review series.
This includes an update of mini_chromium to 6e2f204b4ae1:
f41420eb45fa Use BUILDFLAG for OS checking
6e2f204b4ae1 Include what you use: string_util.h uses build_config.h
Bug: chromium:1234043
Change-Id: Ieef86186f094c64e59b853729737e36982f8cf69
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3400258
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
84 lines
2.9 KiB
C++
84 lines
2.9 KiB
C++
// Copyright 2019 The Crashpad Authors. All rights reserved.
|
|
//
|
|
// 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 "util/process/process_memory_sanitized.h"
|
|
|
|
#include "build/build_config.h"
|
|
#include "gtest/gtest.h"
|
|
#include "test/process_type.h"
|
|
#include "util/misc/from_pointer_cast.h"
|
|
#include "util/process/process_memory_native.h"
|
|
|
|
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
#include "test/linux/fake_ptrace_connection.h"
|
|
#endif
|
|
|
|
namespace crashpad {
|
|
namespace test {
|
|
namespace {
|
|
|
|
TEST(ProcessMemorySanitized, DenyDisallowedMemory) {
|
|
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
FakePtraceConnection connection;
|
|
ASSERT_TRUE(connection.Initialize(GetSelfProcess()));
|
|
ProcessMemoryLinux memory(&connection);
|
|
#else
|
|
ProcessMemoryNative memory;
|
|
ASSERT_TRUE(memory.Initialize(GetSelfProcess()));
|
|
#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
|
|
// BUILDFLAG(IS_CHROMEOS)
|
|
|
|
char c = 42;
|
|
char out;
|
|
|
|
ProcessMemorySanitized san_null;
|
|
san_null.Initialize(&memory, nullptr);
|
|
EXPECT_FALSE(san_null.Read(FromPointerCast<VMAddress>(&c), 1, &out));
|
|
|
|
std::vector<std::pair<VMAddress, VMAddress>> allowed_memory;
|
|
ProcessMemorySanitized san_empty;
|
|
san_empty.Initialize(&memory, &allowed_memory);
|
|
EXPECT_FALSE(san_empty.Read(FromPointerCast<VMAddress>(&c), 1, &out));
|
|
}
|
|
|
|
TEST(ProcessMemorySanitized, AllowedMemory) {
|
|
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
FakePtraceConnection connection;
|
|
ASSERT_TRUE(connection.Initialize(GetSelfProcess()));
|
|
ProcessMemoryLinux memory(&connection);
|
|
#else
|
|
ProcessMemoryNative memory;
|
|
ASSERT_TRUE(memory.Initialize(GetSelfProcess()));
|
|
#endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ||
|
|
// BUILDFLAG(IS_CHROMEOS)
|
|
|
|
char str[4] = "ABC";
|
|
char out[4];
|
|
|
|
std::vector<std::pair<VMAddress, VMAddress>> allowed_memory;
|
|
allowed_memory.push_back(std::make_pair(FromPointerCast<VMAddress>(str + 1),
|
|
FromPointerCast<VMAddress>(str + 2)));
|
|
|
|
ProcessMemorySanitized sanitized;
|
|
sanitized.Initialize(&memory, &allowed_memory);
|
|
|
|
EXPECT_FALSE(sanitized.Read(FromPointerCast<VMAddress>(str), 1, &out));
|
|
EXPECT_TRUE(sanitized.Read(FromPointerCast<VMAddress>(str + 1), 1, &out));
|
|
EXPECT_FALSE(sanitized.Read(FromPointerCast<VMAddress>(str + 2), 1, &out));
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace test
|
|
} // namespace crashpad
|