fix getNetworkInterfacesList with unexpected files in /sys/class/net

getNetworkInterfacesList works by iterating over all files in
/sys/class/net. It expects that each file is actually a directory
containing an "ifindex" file.
It is possible that /sys/class/net contains files that doesn't adhere to
above expectation in which case getNetworkInterfacesList returned with
exception.
This commit fixes this by ignoring files that do not adhere to above
expectation.

Change-Id: Ic39a0a9d311fc3269a5d1a8a5e6cbadc3f5a2105

1 files changed, 6 insertions, 1 deletions

diff --git a/luni/src/main/java/java/net/NetworkInterface.java b/luni/src/main/java/java/net/NetworkInterface.java
index 852c09b..0f8e37a 100644
--- a/luni/src/main/java/java/net/NetworkInterface.java
+++ b/luni/src/main/java/java/net/NetworkInterface.java
@@ -118,7 +118,12 @@ public final class NetworkInterface extends Object {
      */
     private static NetworkInterface getByNameInternal(String interfaceName,
             String[] ifInet6Lines) throws SocketException {
-        int interfaceIndex = readIntFile("/sys/class/net/" + interfaceName + "/ifindex");
+        int interfaceIndex;
+        try {
+            interfaceIndex = readIntFile("/sys/class/net/" + interfaceName + "/ifindex");
+        } catch (SocketException e) {
+            return null;
+        }
         List<InetAddress> addresses = new ArrayList<InetAddress>();
         List<InterfaceAddress> interfaceAddresses = new ArrayList<InterfaceAddress>();