mm: vmscan: do not share cgroup iteration between reclaimers

[linux-2.6-microblaze.git] / crypto / gcm.c

diff --git a/crypto/gcm.c b/crypto/gcm.c
index f254e2d..7388420 100644 (file)
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -152,20 +152,7 @@ out:
 static int crypto_gcm_setauthsize(struct crypto_aead *tfm,
                                  unsigned int authsize)
 {
-       switch (authsize) {
-       case 4:
-       case 8:
-       case 12:
-       case 13:
-       case 14:
-       case 15:
-       case 16:
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
+       return crypto_gcm_check_authsize(authsize);
 }
 
 static void crypto_gcm_init_common(struct aead_request *req)
@@ -762,15 +749,11 @@ static int crypto_rfc4106_setauthsize(struct crypto_aead *parent,
                                      unsigned int authsize)
 {
        struct crypto_rfc4106_ctx *ctx = crypto_aead_ctx(parent);
+       int err;
 
-       switch (authsize) {
-       case 8:
-       case 12:
-       case 16:
-               break;
-       default:
-               return -EINVAL;
-       }
+       err = crypto_rfc4106_check_authsize(authsize);
+       if (err)
+               return err;
 
        return crypto_aead_setauthsize(ctx->child, authsize);
 }
@@ -818,8 +801,11 @@ static struct aead_request *crypto_rfc4106_crypt(struct aead_request *req)
 
 static int crypto_rfc4106_encrypt(struct aead_request *req)
 {
-       if (req->assoclen != 16 && req->assoclen != 20)
-               return -EINVAL;
+       int err;
+
+       err = crypto_ipsec_check_assoclen(req->assoclen);
+       if (err)
+               return err;
 
        req = crypto_rfc4106_crypt(req);
 
@@ -828,8 +814,11 @@ static int crypto_rfc4106_encrypt(struct aead_request *req)
 
 static int crypto_rfc4106_decrypt(struct aead_request *req)
 {
-       if (req->assoclen != 16 && req->assoclen != 20)
-               return -EINVAL;
+       int err;
+
+       err = crypto_ipsec_check_assoclen(req->assoclen);
+       if (err)
+               return err;
 
        req = crypto_rfc4106_crypt(req);
 
@@ -1045,12 +1034,14 @@ static int crypto_rfc4543_copy_src_to_dst(struct aead_request *req, bool enc)
 
 static int crypto_rfc4543_encrypt(struct aead_request *req)
 {
-       return crypto_rfc4543_crypt(req, true);
+       return crypto_ipsec_check_assoclen(req->assoclen) ?:
+              crypto_rfc4543_crypt(req, true);
 }
 
 static int crypto_rfc4543_decrypt(struct aead_request *req)
 {
-       return crypto_rfc4543_crypt(req, false);
+       return crypto_ipsec_check_assoclen(req->assoclen) ?:
+              crypto_rfc4543_crypt(req, false);
 }
 
 static int crypto_rfc4543_init_tfm(struct crypto_aead *tfm)