joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Ensure locked Perfetto handle is non-null.

Browse source 
Although the time between when Trace starts and GetDataSourceLocked is
called is small, it's still possible for the handle to be invalidated
between those two points in time. Check validity prior to use.

Test: atest libnetworkstats_test
bug: 289476598
Change-Id: Ie4b3d65178e6ca24382efde3f38162f332144e81
This commit is contained in:
Ryan Zuklie 2023-07-10 17:18:27 -07:00
commit 20dc5a0ef8
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
service-t/native/libs/libnetworkstats/NetworkTraceHandler.cpp
View file

@ -119,7 +119,14 @@ NetworkTracePoller NetworkTraceHandler::sPoller(
// the session and delegates writing. The corresponding handler will write
// with the setting specified in the trace config.
NetworkTraceHandler::Trace([&](NetworkTraceHandler::TraceContext ctx) {
ctx.GetDataSourceLocked()->Write(packets, ctx);
perfetto::LockedHandle<NetworkTraceHandler> handle =
ctx.GetDataSourceLocked();
// The underlying handle can be invalidated between when Trace starts
// and GetDataSourceLocked is called, but not while the LockedHandle
// exists and holds the lock. Check validity prior to use.
if (handle.valid()) {
handle->Write(packets, ctx);
}
});
});