Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c74 am: af8f6f7111 am:... (db8ae41d) · Commits · e / os / android_frameworks_base

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

+25 −7

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

		import com.google.android.collect.Lists;

		import libcore.io.IoUtils;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;

		@@ -7513,18 +7515,34 @@ public class ConnectivityService extends IConnectivityManager.Stub
		public void startNattKeepaliveWithFd(Network network, FileDescriptor fd, int resourceId,
		int intervalSeconds, ISocketKeepaliveCallback cb, String srcAddr,
		String dstAddr) {
		try {
		mKeepaliveTracker.startNattKeepalive(
		getNetworkAgentInfoForNetwork(network), fd, resourceId,
		intervalSeconds, cb,
		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
		public void startTcpKeepalive(Network network, FileDescriptor fd, int intervalSeconds,
		ISocketKeepaliveCallback cb) {
		try {
		enforceKeepalivePermission();
		mKeepaliveTracker.startTcpKeepalive(
		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