StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Cleanup, fix OSS Bazel build

Browse Source 
Bazel 4.0.0 is less lenient in handling escape sequences.

PiperOrigin-RevId: 353827443
Change-Id: I972841464449ed2262a0ef486343ae1ed444ad3c
This commit is contained in:
Christian Blichmann 2021-01-26 02:28:37 -08:00 committed by Copybara-Service
parent 2f58cfc77f
commit 1459cc612e
2 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sandboxed_api/bazel/external/libcap.BUILD vendored
View File

@ -18,8 +18,8 @@ genrule(
outs = ["cap_names.list.h"], outs = ["cap_names.list.h"],
# Use the same logic as libcap/Makefile # Use the same logic as libcap/Makefile
cmd = """ cmd = """
sed -ne '/^#define[ \\t]CAP[_A-Z]\+[ \\t]\+[0-9]\+/{s/^#define \([^ \\t]*\)[ \\t]*\([^ \\t]*\)/\{\"\\1\",\\2\},/p;}' $< | \\ sed -ne '/^#define[ \\t]CAP[_A-Z]\\+[ \\t]\\+[0-9]\\+/{s/^#define \\([^ \\t]*\\)[ \\t]*\\([^ \\t]*\\)/\\{"\\1",\\2\\},/p;}' $< | \\
tr \"[:upper:]\" \"[:lower:]\" > $@ tr "[:upper:]" "[:lower:]" > $@
""", """,
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
) )

40
sandboxed_api/sandbox2/comms.cc
View File

@ -49,6 +49,8 @@
#include "base/dynamic_annotations.h" #include "base/dynamic_annotations.h"
#endif #endif
namespace sandbox2 {
// Future extension point used to mark code sections that invoke syscalls that // Future extension point used to mark code sections that invoke syscalls that
// potentially block. // potentially block.
// Internally at Google, there is an implementation that supports light-weight // Internally at Google, there is an implementation that supports light-weight
@ -60,8 +62,6 @@ class PotentiallyBlockingRegion {
} }
}; };
namespace sandbox2 {
namespace { namespace {
bool IsFatalError(int saved_errno) { bool IsFatalError(int saved_errno) {
return saved_errno != EAGAIN && saved_errno != EWOULDBLOCK && return saved_errno != EAGAIN && saved_errno != EWOULDBLOCK &&
@ -70,22 +70,6 @@ bool IsFatalError(int saved_errno) {
} }
} // namespace } // namespace
constexpr uint32_t Comms::kTagBool;
constexpr uint32_t Comms::kTagInt8;
constexpr uint32_t Comms::kTagUint8;
constexpr uint32_t Comms::kTagInt16;
constexpr uint32_t Comms::kTagUint16;
constexpr uint32_t Comms::kTagInt32;
constexpr uint32_t Comms::kTagUint32;
constexpr uint32_t Comms::kTagInt64;
constexpr uint32_t Comms::kTagUint64;
constexpr uint32_t Comms::kTagString;
constexpr uint32_t Comms::kTagBytes;
constexpr uint32_t Comms::kTagProto2;
constexpr uint32_t Comms::kTagFd;
constexpr int Comms::kSandbox2ClientCommsFD;
Comms::Comms(const std::string& socket_name) : socket_name_(socket_name) {} Comms::Comms(const std::string& socket_name) : socket_name_(socket_name) {}
Comms::Comms(int fd) : connection_fd_(fd) { Comms::Comms(int fd) : connection_fd_(fd) {
@ -235,6 +219,7 @@ bool Comms::SendTLV(uint32_t tag, size_t length, const void* value) {
return false; return false;
} }
if (length > kWarnMsgSize) { if (length > kWarnMsgSize) {
// TODO(cblichmann): Use LOG_FIRST_N once Abseil logging is released.
static int times_warned = 0; static int times_warned = 0;
if (times_warned < 10) { if (times_warned < 10) {
++times_warned; ++times_warned;
@ -333,16 +318,17 @@ bool Comms::RecvFD(int* fd) {
cmsghdr* cmsg = reinterpret_cast<cmsghdr*>(fd_msg); cmsghdr* cmsg = reinterpret_cast<cmsghdr*>(fd_msg);
InternalTLV tlv; InternalTLV tlv;
iovec iov = {&tlv, sizeof(tlv)}; iovec iov = {.iov_base = &tlv, .iov_len = sizeof(tlv)};
msghdr msg; msghdr msg = {
msg.msg_name = nullptr; .msg_name = nullptr,
msg.msg_namelen = 0; .msg_namelen = 0,
msg.msg_iov = &iov; .msg_iov = &iov,
msg.msg_iovlen = 1; .msg_iovlen = 1,
msg.msg_control = cmsg; .msg_control = cmsg,
msg.msg_controllen = sizeof(fd_msg); .msg_controllen = sizeof(fd_msg),
msg.msg_flags = 0; .msg_flags = 0,
};
const auto op = [&msg](int fd) -> ssize_t { const auto op = [&msg](int fd) -> ssize_t {
PotentiallyBlockingRegion region; PotentiallyBlockingRegion region;