From 110aebe86786a784dc3941cbe58bc87984454a2c Mon Sep 17 00:00:00 2001 From: Andrey Markovytch Date: Thu, 9 Jun 2016 13:26:18 +0300 Subject: scsi: ufs: ICE 3.0 changes ICE 3.0 crypto sequences were changed, CTRL_INFO register no longer exists and doesn't need to be configured. The configuration is done via utrd. Change-Id: I5d69436ec59476fc5cd427458d79f8c99266f243 Signed-off-by: Andrey Markovytch --- security/pfe/pfk.c | 11 +++++++---- security/pfe/pfk_kc.c | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'security') diff --git a/security/pfe/pfk.c b/security/pfe/pfk.c index 05afa19c792b..0ed4106d8f4b 100644 --- a/security/pfe/pfk.c +++ b/security/pfe/pfk.c @@ -335,7 +335,7 @@ static int pfk_key_size_to_key_type(size_t key_size, static int pfk_bio_to_key(const struct bio *bio, unsigned char const **key, size_t *key_size, unsigned char const **salt, size_t *salt_size, - bool *is_pfe) + bool *is_pfe, bool start) { struct inode *inode = NULL; int ret = 0; @@ -369,7 +369,8 @@ static int pfk_bio_to_key(const struct bio *bio, unsigned char const **key, return -EPERM; } - pr_debug("loading key for file %s\n", inode_to_filename(inode)); + pr_debug("loading key for file %s, start %d\n", + inode_to_filename(inode), start); ret = pfk_get_page_index(bio, &offset); if (ret != 0) { @@ -467,7 +468,8 @@ int pfk_load_key_start(const struct bio *bio, return -EINVAL; } - ret = pfk_bio_to_key(bio, &key, &key_size, &salt, &salt_size, is_pfe); + ret = pfk_bio_to_key(bio, &key, &key_size, &salt, &salt_size, is_pfe, + true); if (ret != 0) return ret; @@ -548,7 +550,8 @@ int pfk_load_key_end(const struct bio *bio, bool *is_pfe) if (!pfk_is_ready()) return -ENODEV; - ret = pfk_bio_to_key(bio, &key, &key_size, &salt, &salt_size, is_pfe); + ret = pfk_bio_to_key(bio, &key, &key_size, &salt, &salt_size, is_pfe, + false); if (ret != 0) return ret; diff --git a/security/pfe/pfk_kc.c b/security/pfe/pfk_kc.c index 56ab30ac3095..711cb4f905ea 100644 --- a/security/pfe/pfk_kc.c +++ b/security/pfe/pfk_kc.c @@ -493,6 +493,7 @@ int pfk_kc_load_key_start(const unsigned char *key, size_t key_size, entry = kc_find_key(key, key_size, salt, salt_size); if (!entry) { if (async) { + pr_debug("found empty entry, a separate task will populate it\n"); kc_spin_unlock(); return -EAGAIN; } -- cgit v1.2.3