android_system_core/logd/fuzz
Tom Cherry b07e339b53 logd: fix use after resize of contents_ vector
SerializedFlushToState::PopNextUnreadLog() was calling
AddMinHeapEntry() to replenish the element that was just popped off of
the heap, however AddMinHeapEntry() also manages reference counts for
the buffers, and this resulting in the following scenario:

PopNextUnreadLog() returns a pointer referencing log buffer #1
AddMinHeapEntry() sees that all logs from buffer #1 has been read, so
it decrements the reference count
The caller of PopNextUnreadLog() uses the result which references
invalid memory.

This calls CheckForNewLogs() within HasUnreadLogs() instead of
requiring a separate call, which fixes an additional issue where
continuing from the loop in SerializedLogBuffer::FlushTo() may not
pick up subsequent logs in a given log buffer, since CheckForNewLogs()
wouldn't be called.  This was exacerbated by the above change.

This adds a test to check the reference counts for this case and fixes
an argument mismatch in SerializedFlushToStateTest.

This adds the corpus that surfaced the issue.

Bug: 159753229
Bug: 159783005
Test: these unit tests, run fuzzer without error
Change-Id: Ib2636dfc14293b7e2cd00876b9def6e9dbbff4ce
2020-06-24 15:31:46 -07:00
..
corpus logd: fix use after resize of contents_ vector 2020-06-24 15:31:46 -07:00
Android.bp logd: fix use after resize of contents_ vector 2020-06-24 15:31:46 -07:00
log_buffer_log_fuzzer.cpp logd: add fuzzer for SerializedLogBuffer and other improvements 2020-06-23 11:37:49 -07:00
serialized_log_buffer_fuzzer.cpp logd: add fuzzer for SerializedLogBuffer and other improvements 2020-06-23 11:37:49 -07:00