kernel/linux.git/security/keys/encrypted-keys/encrypted.c, branch v3.2.95

KEYS: Fix an error code in request_master_key()

2017-06-05T20:13:48+00:00

commit 57cb17e764ba0aaa169d07796acce54ccfbc6cae upstream. This function has two callers and neither are able to handle a NULL return. Really, -EINVAL is the correct thing return here anyway. This fixes some static checker warnings like: security/keys/encrypted-keys/encrypted.c:709 encrypted_key_decrypt() error: uninitialized symbol 'master_key'. Fixes: 7e70cb497850 ("keys: add new key-type encrypted") Signed-off-by: Dan Carpenter Acked-by: Mimi Zohar Signed-off-by: James Morris Signed-off-by: Ben Hutchings

KEYS: Fix stale key registration at error path

2015-02-20T00:49:29+00:00

commit b26bdde5bb27f3f900e25a95e33a0c476c8c2c48 upstream. When loading encrypted-keys module, if the last check of aes_get_sizes() in init_encrypted() fails, the driver just returns an error without unregistering its key type. This results in the stale entry in the list. In addition to memory leaks, this leads to a kernel crash when registering a new key type later. This patch fixes the problem by swapping the calls of aes_get_sizes() and register_key_type(), and releasing resources properly at the error paths. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=908163 Signed-off-by: Takashi Iwai Signed-off-by: Mimi Zohar Signed-off-by: Ben Hutchings

encrypted-keys: fix error return code

2011-11-16T19:23:13+00:00

Fix request_master_key() error return code. Signed-off-by: Mimi Zohar

security: follow rename pack_hex_byte() to hex_byte_pack()

2011-11-01T00:30:56+00:00

There is no functional change. Signed-off-by: Andy Shevchenko Cc: Mimi Zohar Cc: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

encrypted-keys: check hex2bin result

2011-09-21T03:26:44+00:00

For each hex2bin call in encrypted keys, check that the ascii hex string is valid. On failure, return -EINVAL. Changelog v1: - hex2bin now returns an int Signed-off-by: Mimi Zohar Acked-by: Andy Shevchenko

encrypted-keys: remove trusted-keys dependency

2011-09-14T19:23:49+00:00

Encrypted keys are decrypted/encrypted using either a trusted-key or, for those systems without a TPM, a user-defined key. This patch removes the trusted-keys and TCG_TPM dependencies. Signed-off-by: Mimi Zohar

encrypted-keys: create encrypted-keys directory

2011-09-14T19:22:26+00:00

Move all files associated with encrypted keys to keys/encrypted-keys. Signed-off-by: Mimi Zohar