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

Don't leak map fds in BpfCoordinator#dump. am: 555472a186

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1581523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f674f644b3afbc762423c903a1460a215be712d
This commit is contained in:
Lorenzo Colitti
2021-02-09 22:22:55 +00:00
committed by Automerger Merge Worker
parent 76a663683c 555472a186
commit a6c9626b5d
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
View File

@@ -766,17 +766,16 @@ public class BpfCoordinator {
} }
private void dumpIpv6UpstreamRules(IndentingPrintWriter pw) { private void dumpIpv6UpstreamRules(IndentingPrintWriter pw) {
final BpfMap<TetherUpstream6Key, Tether6Value> ipv6UpstreamMap = mDeps.getBpfUpstream6Map(); try (BpfMap<TetherUpstream6Key, Tether6Value> map = mDeps.getBpfUpstream6Map()) {
if (ipv6UpstreamMap == null) { if (map == null) {
pw.println("No IPv6 upstream"); pw.println("No IPv6 upstream");
return; return;
} }
try { if (map.isEmpty()) {
if (ipv6UpstreamMap.isEmpty()) {
pw.println("No IPv6 upstream rules"); pw.println("No IPv6 upstream rules");
return; return;
} }
ipv6UpstreamMap.forEach((k, v) -> pw.println(ipv6UpstreamRuletoString(k, v))); map.forEach((k, v) -> pw.println(ipv6UpstreamRuletoString(k, v)));
} catch (ErrnoException e) { } catch (ErrnoException e) {
pw.println("Error dumping IPv4 map: " + e); pw.println("Error dumping IPv4 map: " + e);
} }
@@ -797,19 +796,18 @@ public class BpfCoordinator {
} }
private void dumpIpv4ForwardingRules(IndentingPrintWriter pw) { private void dumpIpv4ForwardingRules(IndentingPrintWriter pw) {
final BpfMap<Tether4Key, Tether4Value> ipv4UpstreamMap = mDeps.getBpfUpstream4Map(); try (BpfMap<Tether4Key, Tether4Value> map = mDeps.getBpfUpstream4Map()) {
if (ipv4UpstreamMap == null) { if (map == null) {
pw.println("No IPv4 support"); pw.println("No IPv4 support");
return; return;
} }
try { if (map.isEmpty()) {
if (ipv4UpstreamMap.isEmpty()) {
pw.println("No IPv4 rules"); pw.println("No IPv4 rules");
return; return;
} }
pw.println("[IPv4]: iif(iface) oif(iface) src nat dst"); pw.println("[IPv4]: iif(iface) oif(iface) src nat dst");
pw.increaseIndent(); pw.increaseIndent();
ipv4UpstreamMap.forEach((k, v) -> pw.println(ipv4RuleToString(k, v))); map.forEach((k, v) -> pw.println(ipv4RuleToString(k, v)));
} catch (ErrnoException e) { } catch (ErrnoException e) {
pw.println("Error dumping IPv4 map: " + e); pw.println("Error dumping IPv4 map: " + e);
} }

2
Tethering/src/com/android/networkstack/tethering/BpfMap.java
View File

@@ -218,7 +218,7 @@ public class BpfMap<K extends Struct, V extends Struct> implements AutoCloseable
} }
@Override @Override
public void close() throws Exception { public void close() throws ErrnoException {
closeMap(mMapFd); closeMap(mMapFd);
} }