commit b20f546dbc4094b3fa061ba83d0122735d6cda5e
author Mark Salyzyn <salyzyn@google.com> Tue Feb 21 23:13:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 21 23:13:04 2017 +0000
tree a12a5927a0ac7a3d232bf48fb99fe01e73c9ee9a
parent e49946e1c13309d8ab46269a193c627ce883a73b
parent f216cea61e5c1a3d8746a40397a7b7ec7a275398

Merge "liblog: Harden log_id check." am: c280143d9b
am: cafb1b7776

Change-Id: I49af30395f3904a9e987b01150417ea449d4da3e

liblog/logd_reader.c

diff --git a/liblog/logd_reader.c b/liblog/logd_reader.c
index ccc7da8..a6c3f7a 100644
--- a/liblog/logd_reader.c
+++ b/liblog/logd_reader.c
@@ -91,7 +91,7 @@
 
 static int logdAvailable(log_id_t logId)
 {
-    if (logId > LOG_ID_KERNEL) {
+    if (logId >= LOG_ID_MAX) {
         return -EINVAL;
     }
     if (logId == LOG_ID_SECURITY) {

liblog/logd_writer.c

diff --git a/liblog/logd_writer.c b/liblog/logd_writer.c
index 2bab92e..12b797d 100644
--- a/liblog/logd_writer.c
+++ b/liblog/logd_writer.c
@@ -117,7 +117,7 @@
 
 static int logdAvailable(log_id_t logId)
 {
-    if (logId > LOG_ID_SECURITY) {
+    if (logId >= LOG_ID_MAX || logId == LOG_ID_KERNEL) {
         return -EINVAL;
     }
     if (atomic_load(&logdLoggerWrite.context.sock) < 0) {