diff options
| author | Andy Hung <hunga@google.com> | 2015-10-21 15:11:02 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2015-10-22 11:20:45 -0700 |
| commit | 13c19e7703d6994a7805c116dab33bfbb95bbd21 (patch) | |
| tree | f6ce1f3201af4681f6fcaedb648c4b6a7f7eb024 /libutils/LinearTransform.cpp | |
| parent | 4a8d1255dec24716b537a742ae67c0bc5ad8a41e (diff) | |
| download | core-13c19e7703d6994a7805c116dab33bfbb95bbd21.tar.gz core-13c19e7703d6994a7805c116dab33bfbb95bbd21.tar.bz2 core-13c19e7703d6994a7805c116dab33bfbb95bbd21.zip | |
Disable sanitization for LinearTransform
Avoids potential crash on Fugu.
Bug: 25160007
Change-Id: I2e883539e36204821f3eb97f0ae4a4854014f048
Diffstat (limited to 'libutils/LinearTransform.cpp')
| -rw-r--r-- | libutils/LinearTransform.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/libutils/LinearTransform.cpp b/libutils/LinearTransform.cpp index b7d28d4b3..138ce8be7 100644 --- a/libutils/LinearTransform.cpp +++ b/libutils/LinearTransform.cpp @@ -21,11 +21,24 @@ #include <utils/LinearTransform.h> +// disable sanitize as these functions may intentionally overflow (see comments below). +// the ifdef can be removed when host builds use clang. +#if defined(__clang__) +#define ATTRIBUTE_NO_SANITIZE_INTEGER __attribute__((no_sanitize("integer"))) +#else +#define ATTRIBUTE_NO_SANITIZE_INTEGER +#endif + namespace android { -template<class T> static inline T ABS(T x) { return (x < 0) ? -x : x; } +// sanitize failure with T = int32_t and x = 0x80000000 +template<class T> +ATTRIBUTE_NO_SANITIZE_INTEGER +static inline T ABS(T x) { return (x < 0) ? -x : x; } // Static math methods involving linear transformations +// remote sanitize failure on overflow case. +ATTRIBUTE_NO_SANITIZE_INTEGER static bool scale_u64_to_u64( uint64_t val, uint32_t N, @@ -109,6 +122,8 @@ static bool scale_u64_to_u64( return true; } +// at least one known sanitize failure (see comment below) +ATTRIBUTE_NO_SANITIZE_INTEGER static bool linear_transform_s64_to_s64( int64_t val, int64_t basis1, @@ -172,7 +187,7 @@ static bool linear_transform_s64_to_s64( // (scaled_signbit XOR res_signbit) if (is_neg) - scaled = -scaled; + scaled = -scaled; // known sanitize failure res = scaled + basis2; if ((scaled ^ basis2 ^ INT64_MIN) & (scaled ^ res) & INT64_MIN) @@ -250,6 +265,8 @@ template <class T> void LinearTransform::reduce(T* N, T* D) { template void LinearTransform::reduce<uint64_t>(uint64_t* N, uint64_t* D); template void LinearTransform::reduce<uint32_t>(uint32_t* N, uint32_t* D); +// sanitize failure if *N = 0x80000000 +ATTRIBUTE_NO_SANITIZE_INTEGER void LinearTransform::reduce(int32_t* N, uint32_t* D) { if (N && D && *D) { if (*N < 0) { |