linux-next: manual merge of the crypto tree with the s390 tree

[Mark Brown]

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  arch/s390/crypto/aes_s390.c

between commit:

  9e323d45ba94262 ("s390/crypto: xts-aes-s390 fix extra run-time crypto self 
tests finding")

from the s390 tree and commit:

  ce68acbcb6a5d5d ("crypto: s390/xts-aes - invoke fallback for ciphertext 
stealing")

from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/s390/crypto/aes_s390.c
index 6d2dbb5089d5c,d4f6fd42a1050..0000000000000
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@@ -586,10 -586,7 +586,10 @@@ static int xts_aes_encrypt(struct blkci
        struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm);
        struct blkcipher_walk walk;
  
 +      if (!nbytes)
 +              return -EINVAL;
 +
-       if (unlikely(!xts_ctx->fc))
+       if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCK_SIZE) != 0))
                return xts_fallback_encrypt(desc, dst, src, nbytes);
  
        blkcipher_walk_init(&walk, dst, src, nbytes);
@@@ -603,10 -600,7 +603,10 @@@ static int xts_aes_decrypt(struct blkci
        struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm);
        struct blkcipher_walk walk;
  
 +      if (!nbytes)
 +              return -EINVAL;
 +
-       if (unlikely(!xts_ctx->fc))
+       if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCK_SIZE) != 0))
                return xts_fallback_decrypt(desc, dst, src, nbytes);
  
        blkcipher_walk_init(&walk, dst, src, nbytes);

signature.asc
Description: PGP signature