From d25e256373946e1d715742e98f9dc06436e28592 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Thu, 8 Jul 2021 14:46:48 -0700
Subject: [PATCH] ANDROID: ABI: add new symbols required by fips140.ko

fips140.ko now uses more crypto API functions due to self-tests being
added, so add them to the symbol list and update the ABI representation.

Generated by running:

    BUILD_CONFIG=common/build.config.gki.aarch64.fips140 build/build_abi.sh --update-symbol-list

... then adding the relevant portion only, and then:

    BUILD_CONFIG=common/build.config.gki.aarch64 build/build_abi.sh --update --print-report

Leaf changes summary: 2 artifacts changed (1 filtered out)
Changed leaf types summary: 0 (1 filtered out) leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 2 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

2 Added functions:

  [A] 'function void crypto_cipher_decrypt_one(crypto_cipher*, u8*, const u8*)'
  [A] 'function int crypto_rng_reset(crypto_rng*, const u8*, unsigned int)'

Bug: 153614920
Bug: 188620248
Change-Id: Ic51a3d2c33718d2da41a6b6a9f9578a00322e9d6
Signed-off-by: Eric Biggers <ebiggers@google.com>
[ardb: refresh]
Signed-off-by: Ard Biesheuvel <ardb@google.com>
---
 android/abi_gki_aarch64.xml     | 14 ++++++++++++++
 android/abi_gki_aarch64_fips140 | 11 +++++++++++
 2 files changed, 25 insertions(+)

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 70a60d06019b..b1dd30c0bb3e 100755
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -948,6 +948,7 @@
       <elf-symbol name='crypto_alloc_sync_skcipher' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6adbbe42'/>
       <elf-symbol name='crypto_attr_alg_name' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9a11a0fc'/>
       <elf-symbol name='crypto_check_attr_type' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4934bdd0'/>
+      <elf-symbol name='crypto_cipher_decrypt_one' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa122da44'/>
       <elf-symbol name='crypto_cipher_encrypt_one' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb06c0638'/>
       <elf-symbol name='crypto_cipher_setkey' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3f7520ac'/>
       <elf-symbol name='crypto_comp_compress' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5428a43c'/>
@@ -981,6 +982,7 @@
       <elf-symbol name='crypto_remove_final' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3de9cae1'/>
       <elf-symbol name='crypto_remove_spawns' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4d5d3af8'/>
       <elf-symbol name='crypto_req_done' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfd8d285b'/>
+      <elf-symbol name='crypto_rng_reset' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x28702c1a'/>
       <elf-symbol name='crypto_sha1_finup' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x133d4800'/>
       <elf-symbol name='crypto_sha1_update' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x37c900ce'/>
       <elf-symbol name='crypto_shash_alg_has_setkey' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x65845d3a'/>
@@ -110988,6 +110990,12 @@
         <parameter type-id='f9409001' name='mask_ret' filepath='crypto/algapi.c' line='837' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='crypto_cipher_decrypt_one' mangled-name='crypto_cipher_decrypt_one' filepath='crypto/cipher.c' line='87' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_cipher_decrypt_one'>
+        <parameter type-id='75f72758' name='tfm' filepath='crypto/cipher.c' line='87' column='1'/>
+        <parameter type-id='8bff8096' name='dst' filepath='crypto/cipher.c' line='88' column='1'/>
+        <parameter type-id='bbaf3419' name='src' filepath='crypto/cipher.c' line='88' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='crypto_cipher_encrypt_one' mangled-name='crypto_cipher_encrypt_one' filepath='crypto/cipher.c' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_cipher_encrypt_one'>
         <parameter type-id='75f72758' name='tfm' filepath='crypto/cipher.c' line='80' column='1'/>
         <parameter type-id='8bff8096' name='dst' filepath='crypto/cipher.c' line='81' column='1'/>
@@ -111164,6 +111172,12 @@
         <parameter type-id='95e97e5e' name='err' filepath='crypto/api.c' line='592' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='crypto_rng_reset' mangled-name='crypto_rng_reset' filepath='crypto/rng.c' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_rng_reset'>
+        <parameter type-id='5474f420' name='tfm' filepath='crypto/rng.c' line='31' column='1'/>
+        <parameter type-id='bbaf3419' name='seed' filepath='crypto/rng.c' line='31' column='1'/>
+        <parameter type-id='f0981eeb' name='slen' filepath='crypto/rng.c' line='31' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='crypto_sha1_finup' mangled-name='crypto_sha1_finup' filepath='crypto/sha1_generic.c' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_sha1_finup'>
         <parameter type-id='32efad44' name='desc' filepath='crypto/sha1_generic.c' line='55' column='1'/>
         <parameter type-id='bbaf3419' name='data' filepath='crypto/sha1_generic.c' line='55' column='1'/>
diff --git a/android/abi_gki_aarch64_fips140 b/android/abi_gki_aarch64_fips140
index 05df3848ff15..cf48b6d66aa9 100644
--- a/android/abi_gki_aarch64_fips140
+++ b/android/abi_gki_aarch64_fips140
@@ -1,12 +1,17 @@
 [abi_symbol_list]
+# commonly used symbols
+  module_layout
+  __put_task_struct
 
 # required by fips140.ko
   add_random_ready_callback
   aead_register_instance
+  arm64_const_caps_ready
   bcmp
   cancel_work_sync
   __cfi_slowpath
   cpu_have_feature
+  cpu_hwcap_keys
   crypto_aead_decrypt
   crypto_aead_encrypt
   crypto_aead_setauthsize
@@ -16,11 +21,14 @@
   crypto_alg_list
   crypto_alg_mod_lookup
   crypto_alg_sem
+  crypto_alloc_aead
   crypto_alloc_base
   crypto_alloc_rng
   crypto_alloc_shash
+  crypto_alloc_skcipher
   crypto_attr_alg_name
   crypto_check_attr_type
+  crypto_cipher_decrypt_one
   crypto_cipher_encrypt_one
   crypto_cipher_setkey
   crypto_destroy_tfm
@@ -43,6 +51,7 @@
   crypto_remove_final
   crypto_remove_spawns
   crypto_req_done
+  crypto_rng_reset
   crypto_shash_alg_has_setkey
   crypto_shash_digest
   crypto_shash_final
@@ -77,6 +86,7 @@
   kmalloc_caches
   kmalloc_order_trace
   kmem_cache_alloc_trace
+  kmemdup
   __list_add_valid
   __list_del_entry_valid
   memcpy
@@ -89,6 +99,7 @@
   preempt_schedule_notrace
   printk
   queue_work_on
+  refcount_warn_saturate
   scatterwalk_ffwd
   scatterwalk_map_and_copy
   sg_init_one