summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-09 09:27:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-09 09:27:47 -0800
commitb6db4eb02e135304b820783383844a217dd4886a (patch)
tree4de322ea3639438427bc2777eb158956cd18c368 /include
parent3f02ff5c2c69753666787ed125708d283a823ffb (diff)
parent389a5390583a18e45bc4abd4439291abec5e7a63 (diff)
downloadlinux-b6db4eb02e135304b820783383844a217dd4886a.tar.gz
linux-b6db4eb02e135304b820783383844a217dd4886a.tar.bz2
linux-b6db4eb02e135304b820783383844a217dd4886a.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "Unfortunately the last push that fixed a crash in the crypto scatterwalk code introduced a new crash when SG debugging is enabled. This fixes that" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: scatterwalk - Use sg_chain_ptr on chain entries
Diffstat (limited to 'include')
-rw-r--r--include/crypto/scatterwalk.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 64ebede184f1..6a626a507b8c 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -44,7 +44,7 @@ static inline struct scatterlist *scatterwalk_sg_next(struct scatterlist *sg)
if (sg_is_last(sg))
return NULL;
- return (++sg)->length ? sg : (void *)sg_page(sg);
+ return (++sg)->length ? sg : sg_chain_ptr(sg);
}
static inline void scatterwalk_crypto_chain(struct scatterlist *head,