2 files changed, 9 insertions, 0 deletions

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 38cf73a56731..ad759f1c3777 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1055,6 +1055,9 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
         bp->pad = 0;
         bp->protocol = protocol;
         bp->len = htons(tcplen);
+
+        sg_init_table(sg, 4);
+
         sg_set_buf(&sg[block++], bp, sizeof(*bp));
         nbytes += sizeof(*bp);
 
@@ -1080,6 +1083,8 @@ static int tcp_v4_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
         sg_set_buf(&sg[block++], key->key, key->keylen);
         nbytes += key->keylen;
 
+        sg_mark_end(sg, block);
+
         /* Now store the Hash into the packet */
         err = crypto_hash_init(desc);
         if (err)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 737b755342bd..32dc329762e9 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -757,6 +757,8 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
         bp->len = htonl(tcplen);
         bp->protocol = htonl(protocol);
 
+        sg_init_table(sg, 4);
+
         sg_set_buf(&sg[block++], bp, sizeof(*bp));
         nbytes += sizeof(*bp);
 
@@ -778,6 +780,8 @@ static int tcp_v6_do_calc_md5_hash(char *md5_hash, struct tcp_md5sig_key *key,
         sg_set_buf(&sg[block++], key->key, key->keylen);
         nbytes += key->keylen;
 
+        sg_mark_end(sg, block);
+
         /* Now store the hash into the packet */
         err = crypto_hash_init(desc);
         if (err) {