commit 0de59ba709cd9c81d8c924f24e8103c31b84814d
author Hungming Chen <nuccachen@google.com> Sun May 29 23:40:50 2022 +0800
committer Hungming Chen <nuccachen@google.com> Thu Jun 02 15:20:05 2022 +0800
tree 0fe6c7ec2c025f74b4efaae0c8c591c42dcc4f61
parent 89687392859deadc1c272c739846564fa9506c6e

ClatCoordinator: close tun fd if detect mtu failed

Test: atest com.android.server.connectivity.ClatCoordinatorTest
Change-Id: Ief85bb9b3b7e33383557baf18878db591caa3e82

service/src/com/android/server/connectivity/ClatCoordinator.java

diff --git a/service/src/com/android/server/connectivity/ClatCoordinator.java b/service/src/com/android/server/connectivity/ClatCoordinator.java
index 4a7c77a..8cefd47 100644
--- a/service/src/com/android/server/connectivity/ClatCoordinator.java
+++ b/service/src/com/android/server/connectivity/ClatCoordinator.java
@@ -570,8 +570,14 @@
 
         // Detect ipv4 mtu.
         final Integer fwmark = getFwmark(netId);
-        final int detectedMtu = mDeps.detectMtu(pfx96Str,
+        final int detectedMtu;
+        try {
+            detectedMtu = mDeps.detectMtu(pfx96Str,
                 ByteBuffer.wrap(GOOGLE_DNS_4.getAddress()).getInt(), fwmark);
+        } catch (IOException e) {
+            tunFd.close();
+            throw new IOException("Detect MTU on " + tunIface + " failed: " + e);
+        }
         final int mtu = adjustMtu(detectedMtu);
         Log.i(TAG, "ipv4 mtu is " + mtu);