diff options
author | Dan Pasanen <dan.pasanen@gmail.com> | 2018-05-08 08:19:48 -0500 |
---|---|---|
committer | Dan Pasanen <dan.pasanen@gmail.com> | 2018-05-08 08:19:48 -0500 |
commit | d20af869c4b027ed42ef195f94530864ace614d4 (patch) | |
tree | 1e5532e90663de3f53cdd0963a12903f33fd1daf | |
parent | 82b235862ce6ae7996ab12c3eeb480196e8df3dc (diff) | |
parent | 21925639f8795946d6f74b23b472bf4abf1add2b (diff) | |
download | android_frameworks_native-d20af869c4b027ed42ef195f94530864ace614d4.tar.gz android_frameworks_native-d20af869c4b027ed42ef195f94530864ace614d4.tar.bz2 android_frameworks_native-d20af869c4b027ed42ef195f94530864ace614d4.zip |
Merge tag 'android-8.1.0_r26' into lineage-15.1
Android 8.1.0 Release 26 (OPM2.171019.029.B1)
Change-Id: I78d3afd72aaaa8f7a1d8f0b90fcc25cfeb6f2e39
-rw-r--r-- | services/sensorservice/SensorService.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index dc491d97c..e5b6dcf75 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -21,6 +21,7 @@ #include <cutils/properties.h> #include <hardware/sensors.h> #include <hardware_legacy/power.h> +#include <log/log.h> #include <openssl/digest.h> #include <openssl/hmac.h> #include <openssl/rand.h> @@ -993,10 +994,15 @@ sp<ISensorEventConnection> SensorService::createSensorDirectConnection( // check specific to memory type switch(type) { case SENSOR_DIRECT_MEM_TYPE_ASHMEM: { // channel backed by ashmem + if (resource->numFds < 1) { + ALOGE("Ashmem direct channel requires a memory region to be supplied"); + android_errorWriteLog(0x534e4554, "70986337"); // SafetyNet + return nullptr; + } int fd = resource->data[0]; int size2 = ashmem_get_size_region(fd); // check size consistency - if (size2 < static_cast<int>(size)) { + if (size2 < static_cast<int64_t>(size)) { ALOGE("Ashmem direct channel size %" PRIu32 " greater than shared memory size %d", size, size2); return nullptr; |