Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard against missing mac addresses in onWakeupEvent

Browse Source 
The native code may not send any data for the NFULA_HWADDR on
some networks which can result in an exception. Logging an exception if
this happens over WiFi, as this is not expected.

Test: atest FrameworksNetTests
Test: Manually inspect logs and output of `dumpsys connmetrics`

Bug: 276498460
Change-Id: Iba20ec1f47b682cfff6127eeade0fdbf912945a6
This commit is contained in:
Suprabh Shukla
2023-04-25 23:12:44 -07:00
parent e86d8d8b43
commit affd2a632c
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/net/metrics/WakeupStats.java
View File

@@ -80,18 +80,20 @@ public class WakeupStats {
break;
}
switch (ev.dstHwAddr.getAddressType()) {
case MacAddress.TYPE_UNICAST:
l2UnicastCount++;
break;
case MacAddress.TYPE_MULTICAST:
l2MulticastCount++;
break;
case MacAddress.TYPE_BROADCAST:
l2BroadcastCount++;
break;
default:
break;
if (ev.dstHwAddr != null) {
switch (ev.dstHwAddr.getAddressType()) {
case MacAddress.TYPE_UNICAST:
l2UnicastCount++;
break;
case MacAddress.TYPE_MULTICAST:
l2MulticastCount++;
break;
case MacAddress.TYPE_BROADCAST:
l2BroadcastCount++;
break;
default:
break;
}
}
increment(ethertypes, ev.ethertype);

23
services/core/java/com/android/server/connectivity/NetdEventListenerService.java
View File

@@ -41,6 +41,7 @@ import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.BitUtils;
import com.android.internal.util.FrameworkStatsLog;
import com.android.internal.util.RingBuffer;
@@ -278,6 +279,11 @@ public class NetdEventListenerService extends BaseNetdEventListener {
}
}
private boolean hasWifiTransport(Network network) {
final NetworkCapabilities nc = mCm.getNetworkCapabilities(network);
return nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI);
}
@Override
public synchronized void onWakeupEvent(String prefix, int uid, int ethertype, int ipNextHeader,
byte[] dstHw, String srcIp, String dstIp, int srcPort, int dstPort, long timestampNs) {
@@ -286,12 +292,21 @@ public class NetdEventListenerService extends BaseNetdEventListener {
throw new IllegalArgumentException("Prefix " + prefix
+ " required in format <nethandle>:<interface>");
}
final long netHandle = Long.parseLong(prefixParts[0]);
final Network network = Network.fromNetworkHandle(netHandle);
final WakeupEvent event = new WakeupEvent();
event.iface = prefixParts[1];
event.uid = uid;
event.ethertype = ethertype;
event.dstHwAddr = MacAddress.fromBytes(dstHw);
if (ArrayUtils.isEmpty(dstHw)) {
if (hasWifiTransport(network)) {
Log.e(TAG, "Empty mac address on WiFi transport, network: " + network);
}
event.dstHwAddr = null;
} else {
event.dstHwAddr = MacAddress.fromBytes(dstHw);
}
event.srcIp = srcIp;
event.dstIp = dstIp;
event.ipNextHeader = ipNextHeader;
@@ -306,14 +321,12 @@ public class NetdEventListenerService extends BaseNetdEventListener {
final BatteryStatsInternal bsi = LocalServices.getService(BatteryStatsInternal.class);
if (bsi != null) {
final long netHandle = Long.parseLong(prefixParts[0]);
final long elapsedMs = SystemClock.elapsedRealtime() + event.timestampMs
- System.currentTimeMillis();
bsi.noteCpuWakingNetworkPacket(Network.fromNetworkHandle(netHandle), elapsedMs,
event.uid);
bsi.noteCpuWakingNetworkPacket(network, elapsedMs, event.uid);
}
final String dstMac = event.dstHwAddr.toString();
final String dstMac = String.valueOf(event.dstHwAddr);
FrameworkStatsLog.write(FrameworkStatsLog.PACKET_WAKEUP_OCCURRED,
uid, event.iface, ethertype, dstMac, srcIp, dstIp, ipNextHeader, srcPort, dstPort);
}