From b520b909137c569fdf9829ce583b25e328ea01db Mon Sep 17 00:00:00 2001
From: Ramji Jiyani <ramjiyani@google.com>
Date: Wed, 9 Aug 2023 18:12:40 +0000
Subject: [PATCH] ANDROID: ABI: Update to fix slab-out-of-bounds in
 xhci_vendor_get_ops

type 'struct xhci_hcd' changed
  member 'union { struct xhci_vendor_ops* vendor_ops; struct { u64 android_kabi_reserved1; }; union { }; }' was added
  member 'u64 android_kabi_reserved1' was removed

Bug: 293869685
Test: TH
Change-Id: I1fa551fc1b9263302d38f4e2989eed9f5f0d816a
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
---
 android/abi_gki_aarch64.stg | 44 +++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 0eb6bf6028d8..180374c4cc50 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -37663,6 +37663,10 @@ member {
   id: 0x26e6f511
   type_id: 0x14b5a454
 }
+member {
+  id: 0x27000c61
+  type_id: 0x132e4197
+}
 member {
   id: 0x27031642
   type_id: 0x13222919
@@ -38053,6 +38057,11 @@ member {
   id: 0x3190e1a6
   type_id: 0x496df688
 }
+member {
+  id: 0x31a5da6f
+  type_id: 0x49b90a29
+  offset: 59264
+}
 member {
   id: 0x31aa1057
   type_id: 0x49861740
@@ -38515,6 +38524,10 @@ member {
   type_id: 0x56faddc1
   offset: 840
 }
+member {
+  id: 0x36752b74
+  type_id: 0x56faddc1
+}
 member {
   id: 0x36961302
   type_id: 0x557609c1
@@ -44612,12 +44625,6 @@ member {
   type_id: 0x92233392
   offset: 2496
 }
-member {
-  id: 0x2d0811d3
-  name: "android_kabi_reserved1"
-  type_id: 0x92233392
-  offset: 59264
-}
 member {
   id: 0x2d0811f9
   name: "android_kabi_reserved1"
@@ -195159,6 +195166,11 @@ member {
   type_id: 0x3e10b518
   offset: 6336
 }
+member {
+  id: 0x7d2869d8
+  name: "vendor_ops"
+  type_id: 0x2e19617e
+}
 member {
   id: 0xfd44cde8
   name: "vendor_oui"
@@ -202677,6 +202689,14 @@ struct_union {
     member_id: 0x3c63eaff
   }
 }
+struct_union {
+  id: 0x132e4197
+  kind: STRUCT
+  definition {
+    bytesize: 8
+    member_id: 0x2d081532
+  }
+}
 struct_union {
   id: 0x132f610b
   kind: STRUCT
@@ -205377,6 +205397,16 @@ struct_union {
     member_id: 0x25ab4212
   }
 }
+struct_union {
+  id: 0x49b90a29
+  kind: UNION
+  definition {
+    bytesize: 8
+    member_id: 0x7d2869d8
+    member_id: 0x27000c61
+    member_id: 0x36752b74
+  }
+}
 struct_union {
   id: 0x49df90a7
   kind: UNION
@@ -260756,7 +260786,7 @@ struct_union {
     member_id: 0x06879837
     member_id: 0xf762467b
     member_id: 0x26b32295
-    member_id: 0x2d0811d3
+    member_id: 0x31a5da6f
     member_id: 0x63760917
     member_id: 0xac894244
     member_id: 0xe0f63158