From: Tom Lendacky Date: Thu, 5 Dec 2013 19:09:53 +0000 (-0600) Subject: crypto: scatterwalk - Use sg_chain_ptr on chain entries X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=9096e7d4889516c0bccb9b89b0c72cc5c127989a;p=linux-edison.git crypto: scatterwalk - Use sg_chain_ptr on chain entries commit 389a5390583a18e45bc4abd4439291abec5e7a63 upstream. Now that scatterwalk_sg_chain sets the chain pointer bit the sg_page call in scatterwalk_sg_next hits a BUG_ON when CONFIG_DEBUG_SG is enabled. Use sg_chain_ptr instead of sg_page on a chain entry. Signed-off-by: Tom Lendacky Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h index 09ef1a0c549..2cddd2b92c1 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,