summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-09-10 09:51:11 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2007-09-10 09:51:11 +0200
commit32528d0fbda1093eeeaa7d0a2c498bbb5154099d (patch)
tree091f9df30f873c472ecccac0e9b103dc84a981dd /crypto
parent[CRYPTO] blkcipher: Fix handling of kmalloc page straddling (diff)
downloadlinux-32528d0fbda1093eeeaa7d0a2c498bbb5154099d.tar.xz
linux-32528d0fbda1093eeeaa7d0a2c498bbb5154099d.zip
[CRYPTO] blkcipher: Fix inverted test in blkcipher_get_spot
The previous patch had the conditional inverted. This patch fixes it so that we return the original position if it does not straddle a page. Thanks to Bob Gilligan for spotting this. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/blkcipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 97586afbe63b..d8f8ec320213 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -65,7 +65,7 @@ static inline void blkcipher_unmap_dst(struct blkcipher_walk *walk)
static inline u8 *blkcipher_get_spot(u8 *start, unsigned int len)
{
u8 *end_page = (u8 *)(((unsigned long)(start + len - 1)) & PAGE_MASK);
- return start < end_page ? start : end_page;
+ return start > end_page ? start : end_page;
}
static inline unsigned int blkcipher_done_slow(struct crypto_blkcipher *tfm,