shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: fix up fscrypt merge to build properly

Browse Source 
Ok, that what's I get for celebrating too early...

Fixes: 7f08695198 ("Merge 7c7fdaf6ad ("Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt") into android-mainline")
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I16632cc19377041ab96e9d873d061199d1eb4556
This commit is contained in:
Greg Kroah-Hartman
2020-12-15 14:24:40 +01:00
parent 7f08695198
commit 869d6f0752
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/crypto/keysetup.c
View File

@@ -200,7 +200,7 @@ static int setup_per_mode_enc_key(struct fscrypt_info *ci,
err = -EINVAL;
goto out_unlock;
}
for (i = 0; i <= __FSCRYPT_MODE_MAX; i++) {
for (i = 0; i <= FSCRYPT_MODE_MAX; i++) {
if (fscrypt_is_key_prepared(&keys[i], ci)) {
fscrypt_warn(ci->ci_inode,
"Each hardware-wrapped key can only be used with one encryption mode");