summaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-05-01 01:51:48 +0300
committerTheodore Ts'o <tytso@mit.edu>2018-05-20 23:21:05 +0300
commit590f497d08eeae883a4fc2dd938c89520ac139fd (patch)
treeb4d2d6feff65b6a880c2666eb966874bcc0f9cf0 /fs/xfs
parent544d08fde258b4da72b6cfbe2d7172c86ce9860d (diff)
downloadlinux-590f497d08eeae883a4fc2dd938c89520ac139fd.tar.xz
fscrypt: separate key lookup from key derivation
Refactor the confusingly-named function 'validate_user_key()' into a new function 'find_and_derive_key()' which first finds the keyring key, then does the key derivation. Among other benefits this avoids the strange behavior we had previously where if key derivation failed for some reason, then we would fall back to the alternate key prefix. Now, we'll only fall back to the alternate key prefix if a valid key isn't found. This patch also improves the warning messages that are logged when the keyring key's payload is invalid. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/xfs')
0 files changed, 0 insertions, 0 deletions