Merge branch 'linus' into x86/tracehook

Conflicts:
	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 22 insertions, 11 deletions

diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 65974c6d3d7a..c029d3eb9ef0 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -263,11 +263,12 @@ async_xor_zero_sum(struct page *dest, struct page **src_list,
                 if (unlikely(!tx)) {
                         async_tx_quiesce(&depend_tx);
 
-                        while (!tx)
+                        while (!tx) {
                                 dma_async_issue_pending(chan);
                                 tx = device->device_prep_dma_zero_sum(chan,
                                         dma_src, src_cnt, len, result,
                                         dma_prep_flags);
+                        }
                 }
 
                 async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);
diff --git a/crypto/digest.c b/crypto/digest.c
index ac0919460d14..5d3f1303da98 100644
--- a/crypto/digest.c
+++ b/crypto/digest.c
@@ -225,7 +225,7 @@ int crypto_init_digest_ops_async(struct crypto_tfm *tfm)
         struct ahash_tfm  *crt  = &tfm->crt_ahash;
         struct digest_alg *dalg = &tfm->__crt_alg->cra_digest;
 
-        if (dalg->dia_digestsize > crypto_tfm_alg_blocksize(tfm))
+        if (dalg->dia_digestsize > PAGE_SIZE / 8)
                 return -EINVAL;
 
         crt->init       = digest_async_init;
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 59821a22d752..66368022e0bf 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -481,21 +481,31 @@ next_one:
 
                         for (k = 0, temp = 0; k < template[i].np; k++) {
                                 printk(KERN_INFO "page %u\n", k);
-                                q = &axbuf[IDX[k]];
-                                hexdump(q, template[i].tap[k]);
+                                q = &xbuf[IDX[k]];
+
+                                n = template[i].tap[k];
+                                if (k == template[i].np - 1)
+                                        n += enc ? authsize : -authsize;
+                                hexdump(q, n);
                                 printk(KERN_INFO "%s\n",
-                                       memcmp(q, template[i].result + temp,
-                                              template[i].tap[k] -
-                                              (k < template[i].np - 1 || enc ?
-                                               0 : authsize)) ?
+                                       memcmp(q, template[i].result + temp, n) ?
                                        "fail" : "pass");
 
-                                for (n = 0; q[template[i].tap[k] + n]; n++)
-                                        ;
+                                q += n;
+                                if (k == template[i].np - 1 && !enc) {
+                                        if (memcmp(q, template[i].input +
+                                                      temp + n, authsize))
+                                                n = authsize;
+                                        else
+                                                n = 0;
+                                } else {
+                                        for (n = 0; q[n]; n++)
+                                                ;
+                                }
                                 if (n) {
                                         printk("Result buffer corruption %u "
                                                "bytes:\n", n);
-                                        hexdump(&q[template[i].tap[k]], n);
+                                        hexdump(q, n);
                                 }
 
                                 temp += template[i].tap[k];