LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use java BpfMap in removeUidInterfaceRules

Browse Source 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideVpnTests#testBlockIncomingPacket
Change-Id: I253c75aaeabe138a4f9d57c226744f5766ef1006
This commit is contained in:
Motomu Utsumi
2022-06-30 03:37:18 +00:00
parent 5f52f4f2fb
commit 599c4e5cf4
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/com/android/server/BpfNetMaps.java
View File

@@ -477,9 +477,12 @@ public class BpfNetMaps {
mNetd.firewallRemoveUidInterfaceRules(uids); mNetd.firewallRemoveUidInterfaceRules(uids);
return; return;
} }
synchronized (sUidOwnerMap) { for (final int uid: uids) {
final int err = native_removeUidInterfaceRules(uids); try {
maybeThrow(err, "Unable to remove uid interface rules"); removeRule(uid, IIF_MATCH, "removeUidInterfaceRules");
} catch (ServiceSpecificException e) {
Log.e(TAG, "removeRule failed uid=" + uid + ", " + e);
}
} }
} }

27
tests/unit/java/com/android/server/BpfNetMapsTest.java
View File

@@ -530,4 +530,31 @@ public final class BpfNetMapsTest {
checkUidOwnerValue(uid0, NULL_IIF, match0); checkUidOwnerValue(uid0, NULL_IIF, match0);
checkUidOwnerValue(uid1, NULL_IIF, match1); checkUidOwnerValue(uid1, NULL_IIF, match1);
} }
private void doTestRemoveUidInterfaceRules(final long iif0, final long match0,
final long iif1, final long match1) throws Exception {
final int uid0 = TEST_UIDS[0];
final int uid1 = TEST_UIDS[1];
mUidOwnerMap.updateEntry(new U32(uid0), new UidOwnerValue(iif0, match0));
mUidOwnerMap.updateEntry(new U32(uid1), new UidOwnerValue(iif1, match1));
mBpfNetMaps.removeUidInterfaceRules(TEST_UIDS);
checkUidOwnerValue(uid0, NO_IIF, match0 & ~IIF_MATCH);
checkUidOwnerValue(uid1, NO_IIF, match1 & ~IIF_MATCH);
}
@Test
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testRemoveUidInterfaceRules() throws Exception {
doTestRemoveUidInterfaceRules(TEST_IF_INDEX, IIF_MATCH, NULL_IIF, IIF_MATCH);
// IIF_MATCH and other matches are enabled
doTestRemoveUidInterfaceRules(TEST_IF_INDEX, IIF_MATCH | DOZABLE_MATCH,
NULL_IIF, IIF_MATCH | DOZABLE_MATCH | RESTRICTED_MATCH);
// IIF_MATCH is not enabled
doTestRemoveUidInterfaceRules(NO_IIF, DOZABLE_MATCH,
NO_IIF, DOZABLE_MATCH | POWERSAVE_MATCH | RESTRICTED_MATCH);
}
} }