commit 90050b25284b4ff19c6f25524de8364241cd8c5d
author Chalard Jean <jchalard@google.com> Mon Sep 25 16:29:12 2023 +0900
committer Chalard Jean <jchalard@google.com> Mon Sep 25 20:37:03 2023 +0900
tree 041f5be3954eba3a50ed25b53dbbc9cfd3f6d266
parent 462572b24b68d6fdbcad20a4034d3e6ebb8c8de6

Fix a socket leak

Test: manual :
      adb root
      adb shell lsof | grep system_ | grep IPv
      adb shell dumpsys connectivity --diag
      adb shell lsof | grep system_ | grep IPv
      Before the change : plenty of new open FDs
      After the change : no new FD
Bug: 297483305
Change-Id: I1c1fb8de44e50998e99af8b3aac3f77edce903e0

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);
         }
     }