commit | 54aacdf96a7f57b97f8b6f1a69a8b39ae5ed4b18 | [log] [tgz] |
---|---|---|
author | Devin Moore <devinmoore@google.com> | Fri Feb 17 17:12:46 2023 +0000 |
committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed Feb 22 23:22:40 2023 +0000 |
tree | 4cb0a5311c141d31a6b02480d01582a9eb4b2882 | |
parent | fd8f137133e9e5dfd792fdd329b62aa3e8607d37 [diff] |
Check for malformed Sensor Flattenable Test: libsensorserviceaidl_fuzzer with testcase from bug Bug: 269014004 Merged-In: I0e255c64243c38876fb657cbf942fc1613363216 Change-Id: I0e255c64243c38876fb657cbf942fc1613363216 (cherry picked from commit aeec1802f7befc8fbb18313ad3ac0969c3811870) Merged-In: I0e255c64243c38876fb657cbf942fc1613363216
diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp index 0a49008..efb18c0 100644 --- a/libs/sensor/Sensor.cpp +++ b/libs/sensor/Sensor.cpp
@@ -612,7 +612,13 @@ return false; } outputString8.setTo(static_cast<char const*>(buffer), len); + + if (size < FlattenableUtils::align<4>(len)) { + ALOGE("Malformed Sensor String8 field. Should be in a 4-byte aligned buffer but is not."); + return false; + } FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len)); + return true; }