FAILED: patch "[PATCH] crypto: algif_skcipher - Load TX SG list after waiting" failed to apply to 3.10-stable tree

PATCH [email protected] 1 participant 1 message Feb 14, 2016

Subsystems (2)

Stable branch Crypto API

lore

Share & tools

lore

[email protected]

author maintainer

2016-02-14 21:49 UTC #0 lore raw

The patch below does not apply to the 3.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 4f0414e54e4d1893c6f08260693f8ef84c929293 Mon Sep 17 00:00:00 2001

From: Herbert Xu <[email protected]>
Date: Mon, 18 Jan 2016 18:46:10 +0800
Subject: [PATCH] crypto: algif_skcipher - Load TX SG list after waiting

We need to load the TX SG list in sendmsg(2) after waiting for incoming data, not before.

Cc [email protected]

Reported-by Dmitry Vyukov <[email protected]>

Signed-off-by Herbert Xu <[email protected]>

Tested-by Dmitry Vyukov <[email protected]>

crypto/algif_skcipher.c +7 -7

index dfff8b0b56df..df86fb47c3ae 100644
@@ -647,13 +647,6 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg,
 
 	lock_sock(sk);
 	while (msg_data_left(msg)) {
-		sgl = list_first_entry(&ctx->tsgl,
-				       struct skcipher_sg_list, list);
-		sg = sgl->sg;
-
-		while (!sg->length)
-			sg++;
-
 		if (!ctx->used) {
 			err = skcipher_wait_for_data(sk, flags);
 			if (err)

@@ -674,6 +667,13 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg,
 		if (!used)
 			goto free;
 
+		sgl = list_first_entry(&ctx->tsgl,
+				       struct skcipher_sg_list, list);
+		sg = sgl->sg;
+
+		while (!sg->length)
+			sg++;
+
 		skcipher_request_set_crypt(&ctx->req, sg, ctx->rsgl.sg, used,
 					   ctx->iv);