[CRYPTO] authenc: Use or instead of max on alignment masks

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / crypto / authenc.c

diff --git a/crypto/authenc.c b/crypto/authenc.c
index bc4e608ca84101e274969f03d7066921c43c3444..66fb2aa5c325410f2521cc7da1f86a82243f6be3 100644 (file)
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -333,7 +333,7 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
        inst->alg.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC;
        inst->alg.cra_priority = enc->cra_priority * 10 + auth->cra_priority;
        inst->alg.cra_blocksize = enc->cra_blocksize;
-       inst->alg.cra_alignmask = max(auth->cra_alignmask, enc->cra_alignmask);
+       inst->alg.cra_alignmask = auth->cra_alignmask | enc->cra_alignmask;
        inst->alg.cra_type = &crypto_aead_type;
 
        inst->alg.cra_aead.ivsize = enc->cra_blkcipher.ivsize;