Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af8f6f71 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: I13df61b292a9ec964854641ba170d39caf66125a
parents cbc7b156 4f1a3c1c

services/core/java/com/android/server/ConnectivityService.java

+25 −7
Original line number Original line Diff line number Diff line
@@ -220,6 +220,8 @@ import com.android.server.utils.PriorityDump; 




import com.google.android.collect.Lists;

import com.google.android.collect.Lists;





import libcore.io.IoUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlPullParserException;
@@ -7504,18 +7506,34 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    public void startNattKeepaliveWithFd(Network network, FileDescriptor fd, int resourceId,

    public void startNattKeepaliveWithFd(Network network, FileDescriptor fd, int resourceId,

            int intervalSeconds, ISocketKeepaliveCallback cb, String srcAddr,

            int intervalSeconds, ISocketKeepaliveCallback cb, String srcAddr,

            String dstAddr) {

            String dstAddr) {

        try {

            mKeepaliveTracker.startNattKeepalive(

            mKeepaliveTracker.startNattKeepalive(

                    getNetworkAgentInfoForNetwork(network), fd, resourceId,

                    getNetworkAgentInfoForNetwork(network), fd, resourceId,

                    intervalSeconds, cb,

                    intervalSeconds, cb,

                    srcAddr, dstAddr, NattSocketKeepalive.NATT_PORT);

                    srcAddr, dstAddr, NattSocketKeepalive.NATT_PORT);

        } finally {

            // FileDescriptors coming from AIDL calls must be manually closed to prevent leaks.

            // startNattKeepalive calls Os.dup(fd) before returning, so we can close immediately.

            if (fd != null && Binder.getCallingPid() != Process.myPid()) {

                IoUtils.closeQuietly(fd);

            }

        }

    }

    }





    @Override

    @Override

    public void startTcpKeepalive(Network network, FileDescriptor fd, int intervalSeconds,

    public void startTcpKeepalive(Network network, FileDescriptor fd, int intervalSeconds,

            ISocketKeepaliveCallback cb) {

            ISocketKeepaliveCallback cb) {

        try {

            enforceKeepalivePermission();

            enforceKeepalivePermission();

            mKeepaliveTracker.startTcpKeepalive(

            mKeepaliveTracker.startTcpKeepalive(

                    getNetworkAgentInfoForNetwork(network), fd, intervalSeconds, cb);

                    getNetworkAgentInfoForNetwork(network), fd, intervalSeconds, cb);

        } finally {

            // FileDescriptors coming from AIDL calls must be manually closed to prevent leaks.

            // startTcpKeepalive calls Os.dup(fd) before returning, so we can close immediately.

            if (fd != null && Binder.getCallingPid() != Process.myPid()) {

                IoUtils.closeQuietly(fd);

            }

        }

    }

    }





    @Override

    @Override