From e0f1a4e63c839a96938d65d7aaadeb91d46e5c77 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 26 Oct 2007 00:38:39 -0700
Subject: [PATCH] --- yaml --- r: 72603 b: refs/heads/master c:
 ed0e7e0ca370519d6f79d1093ee2890d4cdee744 h: refs/heads/master i:   72601:
 201065534f10850d7c991613b3fc21623d54d4b3   72599:
 5027b59c54cc1b680c7cfddc90dbcafe878a5b12 v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/esp4.c | 2 ++
 trunk/net/ipv6/esp6.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 18b676941e66..fb67032d8b41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b733588559fc13547a59ccf81651c775b8f2719c
+refs/heads/master: ed0e7e0ca370519d6f79d1093ee2890d4cdee744
diff --git a/trunk/net/ipv4/esp4.c b/trunk/net/ipv4/esp4.c
index 6b1a31a74cf2..ba9840195cf2 100644
--- a/trunk/net/ipv4/esp4.c
+++ b/trunk/net/ipv4/esp4.c
@@ -110,6 +110,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
 			if (!sg)
 				goto unlock;
 		}
+		sg_init_table(sg, nfrags);
 		skb_to_sgvec(skb, sg, esph->enc_data+esp->conf.ivlen-skb->data, clen);
 		err = crypto_blkcipher_encrypt(&desc, sg, sg, clen);
 		if (unlikely(sg != &esp->sgbuf[0]))
@@ -201,6 +202,7 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
 		if (!sg)
 			goto out;
 	}
+	sg_init_table(sg, nfrags);
 	skb_to_sgvec(skb, sg, sizeof(*esph) + esp->conf.ivlen, elen);
 	err = crypto_blkcipher_decrypt(&desc, sg, sg, elen);
 	if (unlikely(sg != &esp->sgbuf[0]))
diff --git a/trunk/net/ipv6/esp6.c b/trunk/net/ipv6/esp6.c
index 72a659806cad..f67d51a4e56d 100644
--- a/trunk/net/ipv6/esp6.c
+++ b/trunk/net/ipv6/esp6.c
@@ -109,6 +109,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
 			if (!sg)
 				goto unlock;
 		}
+		sg_init_table(sg, nfrags);
 		skb_to_sgvec(skb, sg, esph->enc_data+esp->conf.ivlen-skb->data, clen);
 		err = crypto_blkcipher_encrypt(&desc, sg, sg, clen);
 		if (unlikely(sg != &esp->sgbuf[0]))
@@ -205,6 +206,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
 				goto out;
 			}
 		}
+		sg_init_table(sg, nfrags);
 		skb_to_sgvec(skb, sg, sizeof(*esph) + esp->conf.ivlen, elen);
 		ret = crypto_blkcipher_decrypt(&desc, sg, sg, elen);
 		if (unlikely(sg != &esp->sgbuf[0]))