diff --git a/[refs] b/[refs]
index 7f0119f3f7f5..826492f74c8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6df5b9f48dd0e77fa796b9b7d3fde7cc5f1237f2
+refs/heads/master: 1b40efd772f4419fbc1a8940506424246985c333
diff --git a/trunk/crypto/api.c b/trunk/crypto/api.c
index 959c4e5f264f..40ae42e9b6a6 100644
--- a/trunk/crypto/api.c
+++ b/trunk/crypto/api.c
@@ -215,7 +215,10 @@ int crypto_register_alg(struct crypto_alg *alg)
 	if (alg->cra_alignmask & (alg->cra_alignmask + 1))
 		return -EINVAL;
 
-	if (alg->cra_alignmask > PAGE_SIZE)
+	if (alg->cra_alignmask & alg->cra_blocksize)
+		return -EINVAL;
+
+	if (alg->cra_blocksize > PAGE_SIZE)
 		return -EINVAL;
 	
 	down_write(&crypto_alg_sem);