commit af87f5e599edd571a99401c7813427c3ba628169
author Evan Ralston <eralston@amazon.com> Fri Feb 10 01:25:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 10 01:25:56 2017 +0000
tree bbb5a56c196749b72f2b37d9173f50947dde4ae7
parent 4fda8402df5d09434080eb8bde963df3fa03b54d
parent 5ca23c4b4011434d55dc91c5b5adb433ee82e725

Merge "Check against LOG_ID_MAX instead of LOG_ID_KERNEL" am: 9fcabf739b am: 281fa200fb am: ae884d6af2
am: ea67d8d449

Change-Id: Iece20cae94ff7b8b93b801f37366bfc0a89d1c41

liblog/logd_reader.c

diff --git a/liblog/logd_reader.c b/liblog/logd_reader.c
index ccc7da8..9411f36 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 || logId == LOG_ID_KERNEL) {
         return -EINVAL;
     }
     if (logId == LOG_ID_SECURITY) {