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

Merge "Fix system_server crash while iterating CookieTagMap" am: dd5a31eb2d am: c1124eff5b am: 5f3045cae7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990333

Change-Id: Ic459069134734d7bf80b45bb6acd2a9fded4afbb
This commit is contained in:
Maciej Żenczykowski
2022-02-19 22:45:42 +00:00
committed by Automerger Merge Worker
parent e60fa2d099 5f3045cae7
commit 038fd80ce8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java
View File

@@ -1887,7 +1887,13 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
private void deleteKernelTagData(int uid) {
try {
mCookieTagMap.forEach((key, value) -> {
if (value.uid == uid) {
// If SkDestroyListener deletes the socket tag while this code is running,
// forEach will either restart iteration from the beginning or return null,
// depending on when the deletion happens.
// If it returns null, continue iteration to delete the data and in fact it would
// just iterate from first key because BpfMap#getNextKey would return first key
// if the current key is not exist.
if (value != null && value.uid == uid) {
try {
mCookieTagMap.deleteEntry(key);
} catch (ErrnoException e) {