resolved conflicts for merge of d7339813 to lmp-dev
Change-Id: Ib09e75f5168d86e6a73243648e656a54a9cba0a5
diff --git a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
index dde06a2..faa6eea 100644
--- a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
+++ b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
@@ -30,6 +30,7 @@
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/stat.h>
+#include <sys/utsname.h>
#include <fcntl.h>
#include <cutils/log.h>
#include <linux/perf_event.h>
@@ -102,6 +103,17 @@
struct iovec iov;
struct sock_diag_req* sock_diag_data;
+ int major, minor;
+ struct utsname uts;
+ if (uname(&uts) != -1 &&
+ sscanf(uts.release, "%d.%d", &major, &minor) == 2 &&
+ ((major > 3) || ((major == 3) && (minor > 8)))) {
+ // Kernels above 3.8 are patched against CVE-2013-1763
+ // This test generates false positives if run on > 3.8.
+ // b/17253473
+ return PASSED;
+ }
+
fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_SOCK_DIAG);
if (fd == -1) {
switch (errno) {