shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-25 12:00:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: abi preservation for fscrypt change in 5.10.154

Browse Source 
commit 391cceee6d ("fscrypt: stop using keyrings subsystem for
fscrypt_master_key") changed the pointer types of 2 pointers.  These are
private pointers to the fscrypt code, which will not matter to any GKI
users, but the types change so the CRC needs to be preserved and the
.xml file needs to be updates to reflect the type changes that happened.

type 'struct super_block' changed
  member changed from 'struct key * s_master_keys' to 'struct fscrypt_keyring * s_master_keys'
    type changed from 'struct key *' to 'struct fscrypt_keyring *'
      pointed-to type changed from 'struct key' to 'struct fscrypt_keyring'

Bug: 161946584
Cc: Eric Biggers <ebiggers@google.com>
Fixes: 391cceee6d ("fscrypt: stop using keyrings subsystem for fscrypt_master_key")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia8bec0c8879e7b6bd4e19baf59f36a22d11f4b9b
This commit is contained in:
Greg Kroah-Hartman
2022-12-07 10:11:51 +00:00
parent c007a0aa82
commit 319eb6144e
2 changed files with 797 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1574
android/abi_gki_aarch64.xml
View File

File diff suppressed because it is too large Load Diff

9
include/linux/fs.h
View File

@@ -1471,8 +1471,17 @@ struct super_block {
const struct xattr_handler **s_xattr;
#ifdef CONFIG_FS_ENCRYPTION
const struct fscrypt_operations *s_cop;
#ifdef __GENKSYMS__
/*
* Android ABI CRC preservation due to commit 391cceee6d43 ("fscrypt:
* stop using keyrings subsystem for fscrypt_master_key") changing this
* type. Size is the same, this is a private field.
*/
struct key *s_master_keys; /* master crypto keys in use */
#else
struct fscrypt_keyring *s_master_keys; /* master crypto keys in use */
#endif
#endif
#ifdef CONFIG_FS_VERITY
const struct fsverity_operations *s_vop;
#endif