diff options
| author | Tom Lendacky <thomas.lendacky@amd.com> | 2013-12-05 13:09:53 -0600 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-01-03 04:33:29 +0000 |
| commit | 6c91c0aefd4430b87534794e2c3481e7b476e51b (patch) | |
| tree | 537982393c41b9849002e13f7a73e266fb364b97 /include/crypto | |
| parent | ec61938f01744d104f7c5b4553990e6d4a669bea (diff) | |
| download | kernel_samsung_smdk4412-6c91c0aefd4430b87534794e2c3481e7b476e51b.zip kernel_samsung_smdk4412-6c91c0aefd4430b87534794e2c3481e7b476e51b.tar.gz kernel_samsung_smdk4412-6c91c0aefd4430b87534794e2c3481e7b476e51b.tar.bz2 | |
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 <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/scatterwalk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h index 6726476..0532279 100644 --- a/include/crypto/scatterwalk.h +++ b/include/crypto/scatterwalk.h @@ -66,7 +66,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, |