OSDN Git Service

fscrypt: only derive the needed portion of the key
authorEric Biggers <ebiggers@google.com>
Mon, 30 Apr 2018 22:51:49 +0000 (15:51 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 28 Jun 2018 20:24:35 +0000 (13:24 -0700)
commit27a0e77380a3767929df1b4e563096f51b90a041
treeb9d8fdbb6f65b13f23612ab4acbfffb1bad57196
parentf68a71fa8f773c82ed70feb398d7b1ab8cca2dd3
fscrypt: only derive the needed portion of the key

Currently the key derivation function in fscrypt uses the master key
length as the amount of output key material to derive.  This works, but
it means we can waste time deriving more key material than is actually
used, e.g. most commonly, deriving 64 bytes for directories which only
take a 32-byte AES-256-CTS-CBC key.  It also forces us to validate that
the master key length is a multiple of AES_BLOCK_SIZE, which wouldn't
otherwise be necessary.

Fix it to only derive the needed length key.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/crypto/keyinfo.c