Skip to content

Commit

Permalink
fix(usespace/libsinsp): check for null inspector before accessing stats
Browse files Browse the repository at this point in the history 
Signed-off-by: Jason Dellaluce <[email protected]>
  • Loading branch information
@jasondellaluce @poiana
jasondellaluce authored and poiana committed Nov 29, 2023
1 parent d144fdc commit cabe6d3
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions userspace/libsinsp/container.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ bool sinsp_container_manager::remove_inactive_containers()
});

auto containers = m_containers.lock();
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_missing_container_images = 0;
// Will include pod sanboxes, but that's ok
Expand All @@ -97,7 +97,7 @@ bool sinsp_container_manager::remove_inactive_containers()
for(auto it = containers->begin(); it != containers->end();)
{
sinsp_container_info::ptr_t container = it->second;
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
auto container_info = container.get();
if (!container_info || (container_info && !container_info->m_is_pod_sandbox && container_info->m_image.empty()))
Expand Down
12 changes: 6 additions & 6 deletions userspace/libsinsp/fdinfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ sinsp_fdinfo_t* sinsp_fdtable::find(int64_t fd)
//
if(m_last_accessed_fd != -1 && fd == m_last_accessed_fd)
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_cached_fd_lookups++;
}
Expand All @@ -300,15 +300,15 @@ sinsp_fdinfo_t* sinsp_fdtable::find(int64_t fd)

if(fdit == m_table.end())
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_failed_fd_lookups++;
}
return NULL;
}
else
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_noncached_fd_lookups++;
}
Expand Down Expand Up @@ -340,7 +340,7 @@ sinsp_fdinfo_t* sinsp_fdtable::add(int64_t fd, sinsp_fdinfo_t* fdinfo)
// No entry in the table, this is the normal case
//
m_last_accessed_fd = -1;
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_added_fds++;
}
Expand Down Expand Up @@ -412,15 +412,15 @@ void sinsp_fdtable::erase(int64_t fd)
// keep going.
//
ASSERT(false);
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_failed_fd_lookups++;
}
}
else
{
m_table.erase(fdit);
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_noncached_fd_lookups++;
m_inspector->m_sinsp_stats_v2->m_n_removed_fds++;
Expand Down
18 changes: 9 additions & 9 deletions userspace/libsinsp/parsers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ bool sinsp_parser::reset(sinsp_evt *evt)
etype == PPME_SYSCALL_VFORK_20_X ||
etype == PPME_SYSCALL_CLONE3_X)
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_failed_thread_lookups--;
}
Expand Down Expand Up @@ -826,7 +826,7 @@ void sinsp_parser::store_event(sinsp_evt *evt)
// we won't be able to parse the corresponding exit event and we'll have
// to drop the information it carries.
//
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_store_evts_drops++;
}
Expand Down Expand Up @@ -862,7 +862,7 @@ void sinsp_parser::store_event(sinsp_evt *evt)
memcpy(tinfo->m_lastevent_data, evt->m_pevt, elen);
tinfo->m_lastevent_cpuid = evt->get_cpuid();

if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_stored_evts++;
}
Expand All @@ -887,7 +887,7 @@ bool sinsp_parser::retrieve_enter_event(sinsp_evt *enter_evt, sinsp_evt *exit_ev
// This happen especially at the beginning of trace files, where events
// can be truncated
//
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_retrieve_evts_drops++;
}
Expand All @@ -910,7 +910,7 @@ bool sinsp_parser::retrieve_enter_event(sinsp_evt *enter_evt, sinsp_evt *exit_ev
&&
enter_evt->get_type() == PPME_SYSCALL_EXECVEAT_E)
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_retrieved_evts++;
}
Expand All @@ -925,13 +925,13 @@ bool sinsp_parser::retrieve_enter_event(sinsp_evt *enter_evt, sinsp_evt *exit_ev
{
//ASSERT(false);
exit_evt->m_tinfo->set_lastevent_data_validity(false);
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_retrieve_evts_drops++;
}
return false;
}
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_retrieved_evts++;
}
Expand Down Expand Up @@ -3654,13 +3654,13 @@ void sinsp_parser::parse_close_exit(sinsp_evt *evt)
// It is normal when a close fails that the fd lookup failed, so we revert the
// increment of m_n_failed_fd_lookups (for the enter event too if there's one).
//
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_failed_fd_lookups--;
}
if(evt->m_tinfo && evt->m_tinfo->is_lastevent_data_valid())
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_failed_fd_lookups--;
}
Expand Down
12 changes: 6 additions & 6 deletions userspace/libsinsp/threadinfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,7 @@ bool sinsp_thread_manager::add_thread(sinsp_threadinfo *threadinfo, bool from_sc
#endif
)
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
// rate limit messages to avoid spamming the logs
if (m_inspector->m_sinsp_stats_v2->m_n_drops_full_threadtable % m_max_thread_table_size == 0)
Expand Down Expand Up @@ -1505,7 +1505,7 @@ bool sinsp_thread_manager::add_thread(sinsp_threadinfo *threadinfo, bool from_sc
tinfo_shared_ptr->compute_program_hash();
m_threadtable.put(std::move(tinfo_shared_ptr));

if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_added_threads++;
}
Expand Down Expand Up @@ -1777,7 +1777,7 @@ void sinsp_thread_manager::remove_thread(int64_t tid)
* the cache just to be sure.
*/
m_last_tid = -1;
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_removed_threads++;
}
Expand Down Expand Up @@ -2112,7 +2112,7 @@ threadinfo_map_t::ptr_t sinsp_thread_manager::find_thread(int64_t tid, bool look
thr = m_last_tinfo.lock();
if (thr)
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_cached_thread_lookups++;
}
Expand All @@ -2130,7 +2130,7 @@ threadinfo_map_t::ptr_t sinsp_thread_manager::find_thread(int64_t tid, bool look

if(thr)
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_noncached_thread_lookups++;
}
Expand All @@ -2145,7 +2145,7 @@ threadinfo_map_t::ptr_t sinsp_thread_manager::find_thread(int64_t tid, bool look
}
else
{
if (m_inspector->m_sinsp_stats_v2)
if (m_inspector != nullptr && m_inspector->m_sinsp_stats_v2)
{
m_inspector->m_sinsp_stats_v2->m_n_failed_thread_lookups++;
}
Expand Down

0 comments on commit cabe6d3

Please sign in to comment.