commit fecd4ceda6f13d0dbc548edd447b05d6a28162a6
author Tom Cherry <tomcherry@google.com> Thu Dec 05 17:54:54 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 05 17:54:54 2019 +0000
tree 22a7e38a52b1dd9621ca0126fa0276ddfd117e77
parent c39bcadde491020f83cf2af922a5a01dfd115429
parent b50e12301579d967e3ddf82bc83fb566a55a6e82

Merge "liblog: accept log messages with hdr_size greater than known headers"

liblog/include/log/log_read.h

diff --git a/liblog/include/log/log_read.h b/liblog/include/log/log_read.h
index ee3b250..6601072 100644
--- a/liblog/include/log/log_read.h
+++ b/liblog/include/log/log_read.h
@@ -114,7 +114,7 @@
   }
   char* msg() {
     unsigned short hdr_size = entry.hdr_size;
-    if (hdr_size != sizeof(entry)) {
+    if (hdr_size >= sizeof(struct log_msg) - sizeof(entry)) {
       return nullptr;
     }
     return reinterpret_cast<char*>(buf) + hdr_size;

liblog/logger_read.cpp

diff --git a/liblog/logger_read.cpp b/liblog/logger_read.cpp
index c65501c..0d383ff 100644
--- a/liblog/logger_read.cpp
+++ b/liblog/logger_read.cpp
@@ -120,7 +120,8 @@
     return -EINVAL;
   }
 
-  if (log_msg->entry.hdr_size != sizeof(log_msg->entry)) {
+  if (log_msg->entry.hdr_size < sizeof(log_msg->entry) ||
+      log_msg->entry.hdr_size >= sizeof(struct log_msg) - sizeof(log_msg->entry)) {
     return -EINVAL;
   }