Merge Linux 2.6.23

2 files changed, 17 insertions, 6 deletions

diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c
index 035007145e78..bc18cbb8ea79 100644
--- a/crypto/async_tx/async_tx.c
+++ b/crypto/async_tx/async_tx.c
@@ -80,6 +80,7 @@ dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
 {
         enum dma_status status;
         struct dma_async_tx_descriptor *iter;
+        struct dma_async_tx_descriptor *parent;
 
         if (!tx)
                 return DMA_SUCCESS;
@@ -87,8 +88,15 @@ dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
         /* poll through the dependency chain, return when tx is complete */
         do {
                 iter = tx;
-                while (iter->cookie == -EBUSY)
-                        iter = iter->parent;
+
+                /* find the root of the unsubmitted dependency chain */
+                while (iter->cookie == -EBUSY) {
+                        parent = iter->parent;
+                        if (parent && parent->cookie == -EBUSY)
+                                iter = iter->parent;
+                        else
+                                break;
+                }
 
                 status = dma_sync_wait(iter->chan, iter->cookie);
         } while (status == DMA_IN_PROGRESS || (iter != tx));
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 7755834b8846..d8f8ec320213 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -59,11 +59,13 @@ static inline void blkcipher_unmap_dst(struct blkcipher_walk *walk)
         scatterwalk_unmap(walk->dst.virt.addr, 1);
 }
 
+/* Get a spot of the specified length that does not straddle a page.
+ * The caller needs to ensure that there is enough space for this operation.
+ */
 static inline u8 *blkcipher_get_spot(u8 *start, unsigned int len)
 {
-        if (offset_in_page(start + len) < len)
-                return (u8 *)((unsigned long)(start + len) & PAGE_MASK);
-        return start;
+        u8 *end_page = (u8 *)(((unsigned long)(start + len - 1)) & PAGE_MASK);
+        return start > end_page ? start : end_page;
 }
 
 static inline unsigned int blkcipher_done_slow(struct crypto_blkcipher *tfm,
@@ -155,7 +157,8 @@ static inline int blkcipher_next_slow(struct blkcipher_desc *desc,
         if (walk->buffer)
                 goto ok;
 
-        n = bsize * 2 + (alignmask & ~(crypto_tfm_ctx_alignment() - 1));
+        n = bsize * 3 - (alignmask + 1) +
+            (alignmask & ~(crypto_tfm_ctx_alignment() - 1));
         walk->buffer = kmalloc(n, GFP_ATOMIC);
         if (!walk->buffer)
                 return blkcipher_walk_done(desc, walk, -ENOMEM);