summaryrefslogtreecommitdiff
path: root/include/crypto
diff options
context:
space:
mode:
authorTom Lendacky <thomas.lendacky@amd.com>2013-11-12 17:46:10 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-12 06:37:52 (GMT)
commit2facb7852a50dbb2073d9ddf688e328e06805c74 (patch)
tree91d7f8cbe0b1d66e3749316fdec837b5df88c03c /include/crypto
parent272051255586c48a191c6748d0b5cfff2e4a4ff5 (diff)
downloadlinux-fsl-qoriq-2facb7852a50dbb2073d9ddf688e328e06805c74.tar.xz
crypto: scatterwalk - Set the chain pointer indication bit
commit 41da8b5adba77e22584f8b45f9641504fa885308 upstream. The scatterwalk_crypto_chain function invokes the scatterwalk_sg_chain function to chain two scatterlists, but the chain pointer indication bit is not set. When the resulting scatterlist is used, for example, by sg_nents to count the number of scatterlist entries, a segfault occurs because sg_nents does not follow the chain pointer to the chained scatterlist. Update scatterwalk_sg_chain to set the chain pointer indication bit as is done by the sg_chain function. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/scatterwalk.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 13621cc..64ebede 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -36,6 +36,7 @@ static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num,
{
sg_set_page(&sg1[num - 1], (void *)sg2, 0, 0);
sg1[num - 1].page_link &= ~0x02;
+ sg1[num - 1].page_link |= 0x01;
}
static inline struct scatterlist *scatterwalk_sg_next(struct scatterlist *sg)