4 files changed, 8 insertions, 4 deletions

diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index 4c93b8a4e81e..147069c9afd0 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -106,7 +106,7 @@ static void aead_wmem_wakeup(struct sock *sk)
 
         rcu_read_lock();
         wq = rcu_dereference(sk->sk_wq);
-        if (wq_has_sleeper(wq))
+        if (skwq_has_sleeper(wq))
                 wake_up_interruptible_sync_poll(&wq->wait, POLLIN |
                                                            POLLRDNORM |
                                                            POLLRDBAND);
@@ -157,7 +157,7 @@ static void aead_data_wakeup(struct sock *sk)
 
         rcu_read_lock();
         wq = rcu_dereference(sk->sk_wq);
-        if (wq_has_sleeper(wq))
+        if (skwq_has_sleeper(wq))
                 wake_up_interruptible_sync_poll(&wq->wait, POLLOUT |
                                                            POLLRDNORM |
                                                            POLLRDBAND);
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index a81c10faf9c4..38c1aa89d3a0 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -243,7 +243,7 @@ static void skcipher_wmem_wakeup(struct sock *sk)
 
         rcu_read_lock();
         wq = rcu_dereference(sk->sk_wq);
-        if (wq_has_sleeper(wq))
+        if (skwq_has_sleeper(wq))
                 wake_up_interruptible_sync_poll(&wq->wait, POLLIN |
                                                            POLLRDNORM |
                                                            POLLRDBAND);
@@ -293,7 +293,7 @@ static void skcipher_data_wakeup(struct sock *sk)
 
         rcu_read_lock();
         wq = rcu_dereference(sk->sk_wq);
-        if (wq_has_sleeper(wq))
+        if (skwq_has_sleeper(wq))
                 wake_up_interruptible_sync_poll(&wq->wait, POLLOUT |
                                                            POLLRDNORM |
                                                            POLLRDBAND);
diff --git a/crypto/asymmetric_keys/x509_public_key.c b/crypto/asymmetric_keys/x509_public_key.c
index 2a44b3752471..9e9e5a6a9ed6 100644
--- a/crypto/asymmetric_keys/x509_public_key.c
+++ b/crypto/asymmetric_keys/x509_public_key.c
@@ -321,6 +321,8 @@ static int x509_key_preparse(struct key_preparsed_payload *prep)
                         goto error_free_cert;
         } else if (!prep->trusted) {
                 ret = x509_validate_trust(cert, get_system_trusted_keyring());
+                if (ret)
+                        ret = x509_validate_trust(cert, get_ima_mok_keyring());
                 if (!ret)
                         prep->trusted = 1;
         }
diff --git a/crypto/hash_info.c b/crypto/hash_info.c
index 3e7ff46f26e8..7b1e0b188ce6 100644
--- a/crypto/hash_info.c
+++ b/crypto/hash_info.c
@@ -31,6 +31,7 @@ const char *const hash_algo_name[HASH_ALGO__LAST] = {
         [HASH_ALGO_TGR_128]     = "tgr128",
         [HASH_ALGO_TGR_160]     = "tgr160",
         [HASH_ALGO_TGR_192]     = "tgr192",
+        [HASH_ALGO_SM3_256]     = "sm3-256",
 };
 EXPORT_SYMBOL_GPL(hash_algo_name);
 
@@ -52,5 +53,6 @@ const int hash_digest_size[HASH_ALGO__LAST] = {
         [HASH_ALGO_TGR_128]     = TGR128_DIGEST_SIZE,
         [HASH_ALGO_TGR_160]     = TGR160_DIGEST_SIZE,
         [HASH_ALGO_TGR_192]     = TGR192_DIGEST_SIZE,
+        [HASH_ALGO_SM3_256]     = SM3256_DIGEST_SIZE,
 };
 EXPORT_SYMBOL_GPL(hash_digest_size);