Add ReinterpretBytes which does a checked, variable size bit cast

This renames and improves the VariableSizeBitCast helper from
util/linux/auxiliary_vector.* and moves it to misc.

Change-Id: I4bf46f4cfc0e60c900ff9bde467a21ad43c684cd
Reviewed-on: https://chromium-review.googlesource.com/534174
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Joshua Peraza 2017-06-19 15:56:07 -07:00 committed by Commit Bot
parent d3e4f09742
commit 8c802aace4
7 changed files with 227 additions and 46 deletions

View File

@ -16,9 +16,6 @@
#include <linux/auxvec.h>
#include <stdio.h>
#include <string.h>
#include <algorithm>
#include "base/files/file_path.h"
#include "base/logging.h"
@ -62,43 +59,4 @@ bool AuxiliaryVector::Read(pid_t pid) {
return false;
}
// static
bool AuxiliaryVector::VariableSizeBitCast(uint64_t data,
char* dest,
size_t dest_size) {
auto data_p = reinterpret_cast<const char*>(&data);
constexpr size_t data_size = sizeof(uint64_t);
// Verify that any unused bytes from data are zero.
// The unused bytes are at the start of the data buffer for big-endian and the
// end of the buffer for little-endian.
if (dest_size < data_size) {
uint64_t zero = 0;
auto extra_bytes = data_p;
#if defined(ARCH_CPU_LITTLE_ENDIAN)
extra_bytes += dest_size;
#endif // ARCH_CPU_LITTLE_ENDIAN
if (memcmp(extra_bytes, &zero, data_size - dest_size) != 0) {
LOG(ERROR) << "information loss";
return false;
}
}
// Zero out the destination, in case it is larger than data.
memset(dest, 0, dest_size);
#if defined(ARCH_CPU_LITTLE_ENDIAN)
// Copy a prefix of data to a prefix of dest for little-endian
memcpy(dest, data_p, std::min(dest_size, data_size));
#else
// or the suffix of data to the suffix of dest for big-endian
if (data_size >= dest_size) {
memcpy(dest, data_p + data_size - dest_size, dest_size);
} else {
memcpy(dest + dest_size - data_size, data_p, data_size);
}
#endif // ARCH_CPU_LITTLE_ENDIAN
return true;
}
} // namespace crashpad

View File

@ -21,6 +21,7 @@
#include "base/logging.h"
#include "base/macros.h"
#include "util/misc/reinterpret_bytes.h"
namespace crashpad {
@ -55,8 +56,7 @@ class AuxiliaryVector {
LOG(ERROR) << "value not found";
return false;
}
return VariableSizeBitCast(
iter->second, reinterpret_cast<char*>(value), sizeof(V));
return ReinterpretBytes(iter->second, value);
}
protected:
@ -66,8 +66,6 @@ class AuxiliaryVector {
template <typename ULong>
bool Read(pid_t pid);
static bool VariableSizeBitCast(uint64_t data, char* dest, size_t dest_size);
DISALLOW_COPY_AND_ASSIGN(AuxiliaryVector);
};

View File

@ -0,0 +1,70 @@
// Copyright 2017 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/misc/reinterpret_bytes.h"
#include <string.h>
#include <algorithm>
#include "base/logging.h"
namespace crashpad {
namespace internal {
bool ReinterpretBytesImpl(const char* data,
size_t data_size,
char* dest,
size_t dest_size) {
// Verify that any unused bytes from data are zero.
// The unused bytes are at the start of the data buffer for big-endian and the
// end of the buffer for little-endian.
if (dest_size < data_size) {
auto extra_bytes = data;
#if defined(ARCH_CPU_LITTLE_ENDIAN)
extra_bytes += dest_size;
#endif // ARCH_CPU_LITTLE_ENDIAN
uint64_t zero = 0;
size_t extra_bytes_size = data_size - dest_size;
while (extra_bytes_size > 0) {
size_t to_check = std::min(extra_bytes_size, sizeof(zero));
if (memcmp(extra_bytes, &zero, to_check) != 0) {
LOG(ERROR) << "information loss";
return false;
}
extra_bytes += to_check;
extra_bytes_size -= to_check;
}
}
// Zero out the destination, in case it is larger than data.
memset(dest, 0, dest_size);
#if defined(ARCH_CPU_LITTLE_ENDIAN)
// Copy a prefix of data to a prefix of dest for little-endian
memcpy(dest, data, std::min(dest_size, data_size));
#else
// or the suffix of data to the suffix of dest for big-endian
if (data_size >= dest_size) {
memcpy(dest, data + data_size - dest_size, dest_size);
} else {
memcpy(dest + dest_size - data_size, data, data_size);
}
#endif // ARCH_CPU_LITTLE_ENDIAN
return true;
}
} // namespace internal
} // namespace crashpad

View File

@ -0,0 +1,48 @@
// Copyright 2017 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.
#ifndef CRASHPAD_UTIL_MISC_REINTERPRET_BYTES_H_
#define CRASHPAD_UTIL_MISC_REINTERPRET_BYTES_H_
#include <stddef.h>
namespace crashpad {
namespace internal {
bool ReinterpretBytesImpl(const char* from,
size_t from_size,
char* to,
size_t to_size);
} // namespace internal
//! \brief Copies the bytes of \a from to \to.
//!
//! This function is similar to `bit_cast`, except that it can operate on
//! differently sized types.
//!
//! \return `true` if the copy is possible without information loss, otherwise
//! `false` with a message logged.
template <typename From, typename To>
bool ReinterpretBytes(const From& from, To* to) {
return internal::ReinterpretBytesImpl(reinterpret_cast<const char*>(&from),
sizeof(From),
reinterpret_cast<char*>(to),
sizeof(To));
}
} // namespace crashpad
#endif // CRASHPAD_UTIL_MISC_REINTERPRET_BYTES_H_

View File

@ -0,0 +1,104 @@
// Copyright 2017 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/misc/reinterpret_bytes.h"
#include <stdint.h>
#include <limits>
#include "base/bit_cast.h"
#include "gtest/gtest.h"
#include "util/numeric/int128.h"
namespace crashpad {
namespace test {
namespace {
template <typename From, typename To>
void ExpectReinterpret(From from, To* to, To expected) {
ASSERT_TRUE(ReinterpretBytes(from, to));
EXPECT_EQ(*to, expected);
}
template <typename From, typename To>
void ExpectUnsignedEqual(From from, To* to) {
To expected = static_cast<To>(from);
ExpectReinterpret(from, to, expected);
}
TEST(ReinterpretBytes, ToUnsigned) {
uint64_t from64, to64;
uint32_t from32, to32;
from32 = 0;
ExpectUnsignedEqual(from32, &to32);
ExpectUnsignedEqual(from32, &to64);
from32 = std::numeric_limits<uint32_t>::max();
ExpectUnsignedEqual(from32, &to32);
ExpectUnsignedEqual(from32, &to64);
from64 = 0;
ExpectUnsignedEqual(from64, &to32);
ExpectUnsignedEqual(from64, &to64);
from64 = std::numeric_limits<uint64_t>::max();
ExpectUnsignedEqual(from64, &to64);
EXPECT_FALSE(ReinterpretBytes(from64, &to32));
uint8_t to8 = std::numeric_limits<uint8_t>::max();
uint128_struct from128;
from128.lo = to8;
from128.hi = 0;
ExpectReinterpret(from128, &to8, to8);
}
TEST(ReinterpretBytes, ToSigned) {
uint64_t from64;
int64_t to64;
int32_t to32;
from64 = 0;
ExpectReinterpret(from64, &to32, static_cast<int32_t>(0));
ExpectReinterpret(from64, &to64, static_cast<int64_t>(0));
to32 = -1;
from64 = bit_cast<uint32_t>(to32);
ExpectReinterpret(from64, &to32, to32);
to32 = std::numeric_limits<int32_t>::max();
from64 = bit_cast<uint32_t>(to32);
ExpectReinterpret(from64, &to32, to32);
to32 = std::numeric_limits<int32_t>::min();
from64 = bit_cast<uint32_t>(to32);
ExpectReinterpret(from64, &to32, to32);
to64 = -1;
from64 = bit_cast<uint64_t>(to64);
ExpectReinterpret(from64, &to64, to64);
to64 = std::numeric_limits<int64_t>::max();
from64 = bit_cast<uint64_t>(to64);
ExpectReinterpret(from64, &to64, to64);
to64 = std::numeric_limits<int64_t>::min();
from64 = bit_cast<uint64_t>(to64);
ExpectReinterpret(from64, &to64, to64);
}
} // namespace
} // namespace test
} // namespace crashpad

View File

@ -120,6 +120,8 @@
'misc/pdb_structures.h',
'misc/random_string.cc',
'misc/random_string.h',
'misc/reinterpret_bytes.cc',
'misc/reinterpret_bytes.h',
'misc/scoped_forbid_return.cc',
'misc/scoped_forbid_return.h',
'misc/symbolic_constants_common.h',

View File

@ -71,6 +71,7 @@
'misc/paths_test.cc',
'misc/scoped_forbid_return_test.cc',
'misc/random_string_test.cc',
'misc/reinterpret_bytes_test.cc',
'misc/uuid_test.cc',
'net/http_body_gzip_test.cc',
'net/http_body_test.cc',