Merge "Don't fail on netlink socket closing." into gingerbread
diff --git a/tests/tests/security/src/android/security/cts/VoldExploitTest.java b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
index 9030843..a72d6de 100644
--- a/tests/tests/security/src/android/security/cts/VoldExploitTest.java
+++ b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
@@ -91,8 +91,17 @@
confirmNetlinkMsgReceived();
}
} catch (IOException e) {
- fail("Message send to PID=" + pid
- + " failed. It probably crashed due to CVE-2011-1823.");
+ // Ignore the exception. The process either:
+ //
+ // 1) Crashed
+ // 2) Closed the netlink socket and refused further messages
+ //
+ // If #1 occurs, our PID check in testTryToCrashVold() will
+ // detect the process crashed and trigger an error.
+ //
+ // #2 is not a security bug. It's perfectly acceptable to
+ // refuse messages from someone trying to send you
+ // malicious content.
}
}
