commit 3f48f42cb9695ce8d8d6b301d7a8b002937100e6
author Jean Chalard <jchalard@google.com> Tue Sep 26 02:57:25 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 26 02:57:25 2023 +0000
tree ab066ed15e18c88d3721bf2b356ee7ed885e60d5
parent f411c022945ad3fad07d414554a391e317b62aa8
parent 90050b25284b4ff19c6f25524de8364241cd8c5d

Merge "Fix a socket leak" into main

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

diff --git a/service/src/com/android/server/connectivity/NetworkDiagnostics.java b/service/src/com/android/server/connectivity/NetworkDiagnostics.java
index e1e2585..3db37e5 100644
--- a/service/src/com/android/server/connectivity/NetworkDiagnostics.java
+++ b/service/src/com/android/server/connectivity/NetworkDiagnostics.java
@@ -340,8 +340,9 @@
     @TargetApi(Build.VERSION_CODES.S)
     private int getMtuForTarget(InetAddress target) {
         final int family = target instanceof Inet4Address ? AF_INET : AF_INET6;
+        FileDescriptor socket = null;
         try {
-            final FileDescriptor socket = Os.socket(family, SOCK_DGRAM, 0);
+            socket = Os.socket(family, SOCK_DGRAM, 0);
             mNetwork.bindSocket(socket);
             Os.connect(socket, target, 0);
             if (family == AF_INET) {
@@ -352,6 +353,8 @@
         } catch (ErrnoException | IOException e) {
             Log.e(TAG, "Can't get MTU for destination " + target, e);
             return -1;
+        } finally {
+            IoUtils.closeQuietly(socket);
         }
     }