Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170
am: cd6ebe9b27
Change-Id: Ia1c55db37373474552543c3a0f4fad7b6305a2a0
diff --git a/include/hardware/power.h b/include/hardware/power.h
index 8da1f98..10612f3 100644
--- a/include/hardware/power.h
+++ b/include/hardware/power.h
@@ -46,11 +46,7 @@
*/
POWER_HINT_VIDEO_ENCODE = 0x00000003,
POWER_HINT_VIDEO_DECODE = 0x00000004,
- POWER_HINT_LOW_POWER = 0x00000005,
- POWER_HINT_FOREGROUND_LOAD = 0x00000006,
- POWER_HINT_VR_MODE = 0x00000007,
- POWER_HINT_LAUNCH = 0x00000008,
- POWER_HINT_DISABLE_TOUCH = 0x00000009
+ POWER_HINT_LOW_POWER = 0x00000005
} power_hint_t;
typedef enum {
@@ -130,14 +126,6 @@
* parameter is non-zero when low power mode is activated, and zero
* when deactivated.
*
- * POWER_HINT_DISABLE_TOUCH
- *
- * When device enters some special modes, e.g. theater mode in Android
- * Wear, there is no touch interaction expected between device and user.
- * Touch controller could be disabled in those modes to save power.
- * The data parameter is non-zero when touch could be disabled, and zero
- * when touch needs to be re-enabled.
- *
* A particular platform may choose to ignore any hint.
*
* availability: version 0.2
diff --git a/modules/sensors/multihal.cpp b/modules/sensors/multihal.cpp
index 6536882..d1536f4 100644
--- a/modules/sensors/multihal.cpp
+++ b/modules/sensors/multihal.cpp
@@ -155,11 +155,7 @@
ALOGV("writerTask before poll() - bufferSize = %d", bufferSize);
eventsPolled = device->poll(device, buffer, bufferSize);
ALOGV("writerTask poll() got %d events.", eventsPolled);
- if (eventsPolled <= 0) {
- if (eventsPolled < 0) {
- ALOGV("writerTask ignored error %d from %s", eventsPolled, device->common.module->name);
- ALOGE("ERROR: Fix %s so it does not return error from poll()", device->common.module->name);
- }
+ if (eventsPolled == 0) {
continue;
}
pthread_mutex_lock(&queue_mutex);