diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-06-17 16:34:32 -0700 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2011-06-17 16:34:32 -0700 |
| commit | 3f3337a662e9916bbf14502ef3b32dedaa7adfa4 (patch) | |
| tree | ff618b98e69808ae0cc4782b1808b5a0ab8fd626 | |
| parent | ced4bb1df71355ff308ca4e8bfdc4a43ae53795b (diff) | |
| download | frameworks_base-3f3337a662e9916bbf14502ef3b32dedaa7adfa4.zip frameworks_base-3f3337a662e9916bbf14502ef3b32dedaa7adfa4.tar.gz frameworks_base-3f3337a662e9916bbf14502ef3b32dedaa7adfa4.tar.bz2 | |
VPN: avoid leaking file descriptors.
Change-Id: If70f5af3529d79bddb9d72675cf6eb038ff3ff70
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/connectivity/Vpn.java | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a8aff37..47902a8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -91,6 +91,8 @@ <protected-broadcast android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" /> <protected-broadcast android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" /> + <protected-broadcast android:name="android.net.vpn.action.REVOKED" /> + <protected-broadcast android:name="android.nfc.action.LLCP_LINK_STATE_CHANGED" /> <protected-broadcast android:name="com.android.nfc_extras.action.RF_FIELD_ON_DETECTED" /> <protected-broadcast android:name="com.android.nfc_extras.action.RF_FIELD_OFF_DETECTED" /> diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java index 035a667..47813f8 100644 --- a/services/java/com/android/server/connectivity/Vpn.java +++ b/services/java/com/android/server/connectivity/Vpn.java @@ -102,14 +102,22 @@ public class Vpn extends INetworkManagementEventObserver.Stub { /** * Protect a socket from routing changes by binding it to the given - * interface. The socket is NOT closed by this method. + * interface. The socket IS closed by this method. * * @param socket The socket to be bound. * @param name The name of the interface. */ public void protect(ParcelFileDescriptor socket, String name) { - mContext.enforceCallingPermission(VPN, "protect"); - nativeProtect(socket.getFd(), name); + try { + mContext.enforceCallingPermission(VPN, "protect"); + nativeProtect(socket.getFd(), name); + } finally { + try { + socket.close(); + } catch (Exception e) { + // ignore + } + } } /** |