diff mbox

[3.5.y.z,extended,stable] Patch "crypto: scatterwalk - Use sg_chain_ptr on chain entries" has been added to staging queue

Message ID 986457BC66A4884EBFFDEFEBEB20F84C0B1F2ACD@satlexdag03.amd.com
State New
Headers show

Commit Message

Tom Lendacky Dec. 17, 2013, 2:43 p.m. UTC 
Hi Luis,

This is the patch that I said you needed if you included commit 41da8b5adba77e22584f8b45f9641504fa885308.  You said you were going to drop that commit, but now you can pick it up if you are going to include commit 389a5390583a18e45bc4abd4439291abec5e7a63.  It's up to you.

Thanks,
Tom

-----Original Message-----
From: Luis Henriques [mailto:luis.henriques@canonical.com] 
Sent: Tuesday, December 17, 2013 7:31 AM
To: Lendacky, Thomas
Cc: Herbert Xu; Luis Henriques; kernel-team@lists.ubuntu.com
Subject: [3.5.y.z extended stable] Patch "crypto: scatterwalk - Use sg_chain_ptr on chain entries" has been added to staging queue

This is a note to let you know that I have just added a patch titled

    crypto: scatterwalk - Use sg_chain_ptr on chain entries

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please reply to this email.

For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

From 13efda3a4f5a528095ebe6399528345009220336 Mon Sep 17 00:00:00 2001
From: Tom Lendacky <thomas.lendacky@amd.com>
Date: Thu, 5 Dec 2013 13:09:53 -0600
Subject: 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: Luis Henriques <luis.henriques@canonical.com>
---
 include/crypto/scatterwalk.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
1.8.3.2
diff mbox

Patch

diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h index 3744d2a..9b11b38 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -43,7 +43,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,