From b2455c626ef880e326e6d58ce927a3a930acfe99 Mon Sep 17 00:00:00 2001
From: Kevin Jeon <kevinjeon@google.com>
Date: Fri, 4 Aug 2023 16:06:54 -0400
Subject: [PATCH] Explicitly initialize Stats fields
This change adds InitStats for explictly zero-initializing rx/tx
bytes/packets, and -1-initializing rx/tx tcp packets.
Test: Build, existing unit tests.
Bug: 241098920
Change-Id: Ib9598dab924b48240461b31906a4b5698db255d8
---
.../libs/libnetworkstats/BpfNetworkStats.cpp | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
index 1bc8ca5b58..5579e43e95 100644
--- a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
+++ b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
@@ -40,8 +40,19 @@ namespace bpf {
using base::Result;
+// This explicitly zero-initializes the relevant Stats fields.
+void InitStats(Stats* stats) {
+ stats->rxBytes = 0;
+ stats->rxPackets = 0;
+ stats->txBytes = 0;
+ stats->txPackets = 0;
+ stats->tcpRxPackets = -1;
+ stats->tcpTxPackets = -1;
+}
+
int bpfGetUidStatsInternal(uid_t uid, Stats* stats,
const BpfMap<uint32_t, StatsValue>& appUidStatsMap) {
+ InitStats(stats);
auto statsEntry = appUidStatsMap.readValue(uid);
if (statsEntry.ok()) {
stats->rxPackets = statsEntry.value().rxPackets;
@@ -61,9 +72,8 @@ int bpfGetUidStats(uid_t uid, Stats* stats) {
int bpfGetIfaceStatsInternal(const char* iface, Stats* stats,
const BpfMap<uint32_t, StatsValue>& ifaceStatsMap,
const BpfMap<uint32_t, IfaceValue>& ifaceNameMap) {
+ InitStats(stats);
int64_t unknownIfaceBytesTotal = 0;
- stats->tcpRxPackets = -1;
- stats->tcpTxPackets = -1;
const auto processIfaceStats =
[iface, stats, &ifaceNameMap, &unknownIfaceBytesTotal](
const uint32_t& key,
--
GitLab