summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-11-15 18:40:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-15 18:40:13 +0000
commitb8012e89f8b4842b7172a0cba50fbd0ceb76c8a0 (patch)
tree29233179a6675d0b5e1d4da650e5dea86abadacd
parent6a5270ff74ba886b0d3c4c8f9589771e24fc7a49 (diff)
parent998b595de4a370ee8edd0f24bde8ea223e45c516 (diff)
downloadcts-b8012e89f8b4842b7172a0cba50fbd0ceb76c8a0.tar.gz
Merge "STS fix for CVE-2021-0490" into pi-dev am: 8801eb2ed9 am: c756ed7970 am: bc5a21dd11 am: a276a17a12 am: f1475038ca am: 998b595de4
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/16250647 Change-Id: I7ecd677a7708f1191ab1e9fb9c59bea13a7dd001
-rw-r--r--hostsidetests/securitybulletin/securityPatch/CVE-2021-0490/poc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2021-0490/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2021-0490/poc.cpp
index 793ad9c81c0..04a9c990387 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2021-0490/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2021-0490/poc.cpp
@@ -358,18 +358,18 @@ int poc_write_kernel() {
ALOGE("re_buf addr:%p", re_buf);
ALOGE("re_buf[0]:%x", re_buf[0]);
- int read_num = 0;
+ unsigned long read_num = 0;
int counter = 0;
unsigned long *read_buf = (unsigned long *)re_buf;
for (read_num = 0; read_num < MMAP_SIZE/sizeof(unsigned long); read_num++) {
if (read_buf[read_num]) {
//reduce number of log messages
if(counter++ % 8 == 0){
- ALOGE("read_buf[%d]:0x%lx", read_num, read_buf[read_num]);
+ ALOGE("read_buf[%lu]:0x%lx", read_num, read_buf[read_num]);
}
}
}
- ALOGE("read_num = %d", read_num);
+ ALOGE("read_num = %lu", read_num);
ALOGE("non zero = %d", counter);
memset(re_buf, 0xbb, MMAP_SIZE);