2 files changed, 21 insertions, 10 deletions

diff --git a/crypto/hmac.c b/crypto/hmac.c
index e4eb6ac53b5c..0f05be769c34 100644
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -61,7 +61,7 @@ static int hmac_setkey(struct crypto_hash *parent,
                 desc.tfm = tfm;
                 desc.flags = crypto_hash_get_flags(parent);
                 desc.flags &= CRYPTO_TFM_REQ_MAY_SLEEP;
-                sg_set_buf(&tmp, inkey, keylen);
+                sg_init_one(&tmp, inkey, keylen);
 
                 err = crypto_hash_digest(&desc, &tmp, keylen, digest);
                 if (err)
@@ -96,7 +96,7 @@ static int hmac_init(struct hash_desc *pdesc)
 
         desc.tfm = ctx->child;
         desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
-        sg_set_buf(&tmp, ipad, bs);
+        sg_init_one(&tmp, ipad, bs);
 
         err = crypto_hash_init(&desc);
         if (unlikely(err))
@@ -131,7 +131,7 @@ static int hmac_final(struct hash_desc *pdesc, u8 *out)
 
         desc.tfm = ctx->child;
         desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
-        sg_set_buf(&tmp, opad, bs + ds);
+        sg_init_one(&tmp, opad, bs + ds);
 
         err = crypto_hash_final(&desc, digest);
         if (unlikely(err))
@@ -158,10 +158,11 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
         desc.tfm = ctx->child;
         desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
 
+        sg_init_table(sg1, 2);
         sg_set_buf(sg1, ipad, bs);
+        sg_set_page(&sg1[1], (void *) sg, 0, 0);
 
-        sg_set_page(&sg[1], (void *) sg);
-        sg1[1].length = 0;
+        sg_init_table(sg2, 1);
         sg_set_buf(sg2, opad, bs + ds);
 
         err = crypto_hash_digest(&desc, sg1, nbytes + bs, digest);
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index d741c63af42c..24141fb6f5cb 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -139,7 +139,7 @@ static void test_hash(char *algo, struct hash_testvec *template,
                 printk("test %u:\n", i + 1);
                 memset(result, 0, 64);
 
-                sg_set_buf(&sg[0], hash_tv[i].plaintext, hash_tv[i].psize);
+                sg_init_one(&sg[0], hash_tv[i].plaintext, hash_tv[i].psize);
 
                 if (hash_tv[i].ksize) {
                         ret = crypto_hash_setkey(tfm, hash_tv[i].key,
@@ -176,6 +176,7 @@ static void test_hash(char *algo, struct hash_testvec *template,
                         memset(result, 0, 64);
 
                         temp = 0;
+                        sg_init_table(sg, hash_tv[i].np);
                         for (k = 0; k < hash_tv[i].np; k++) {
                                 memcpy(&xbuf[IDX[k]],
                                        hash_tv[i].plaintext + temp,
@@ -289,8 +290,8 @@ static void test_cipher(char *algo, int enc,
                                         goto out;
                         }
 
-                        sg_set_buf(&sg[0], cipher_tv[i].input,
-                                   cipher_tv[i].ilen);
+                        sg_init_one(&sg[0], cipher_tv[i].input,
+                                    cipher_tv[i].ilen);
 
                         ablkcipher_request_set_crypt(req, sg, sg,
                                                      cipher_tv[i].ilen,
@@ -353,6 +354,7 @@ static void test_cipher(char *algo, int enc,
                         }
 
                         temp = 0;
+                        sg_init_table(sg, cipher_tv[i].np);
                         for (k = 0; k < cipher_tv[i].np; k++) {
                                 memcpy(&xbuf[IDX[k]],
                                        cipher_tv[i].input + temp,
@@ -414,7 +416,7 @@ static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc, char *p,
         int bcount;
         int ret;
 
-        sg_set_buf(sg, p, blen);
+        sg_init_one(sg, p, blen);
 
         for (start = jiffies, end = start + sec * HZ, bcount = 0;
              time_before(jiffies, end); bcount++) {
@@ -440,7 +442,7 @@ static int test_cipher_cycles(struct blkcipher_desc *desc, int enc, char *p,
         int ret = 0;
         int i;
 
-        sg_set_buf(sg, p, blen);
+        sg_init_one(sg, p, blen);
 
         local_bh_disable();
         local_irq_disable();
@@ -570,6 +572,8 @@ static int test_hash_jiffies_digest(struct hash_desc *desc, char *p, int blen,
         int bcount;
         int ret;
 
+        sg_init_table(sg, 1);
+
         for (start = jiffies, end = start + sec * HZ, bcount = 0;
              time_before(jiffies, end); bcount++) {
                 sg_set_buf(sg, p, blen);
@@ -595,6 +599,8 @@ static int test_hash_jiffies(struct hash_desc *desc, char *p, int blen,
         if (plen == blen)
                 return test_hash_jiffies_digest(desc, p, blen, out, sec);
 
+        sg_init_table(sg, 1);
+
         for (start = jiffies, end = start + sec * HZ, bcount = 0;
              time_before(jiffies, end); bcount++) {
                 ret = crypto_hash_init(desc);
@@ -626,6 +632,8 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen,
         int i;
         int ret;
 
+        sg_init_table(sg, 1);
+
         local_bh_disable();
         local_irq_disable();
 
@@ -677,6 +685,8 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen,
         if (plen == blen)
                 return test_hash_cycles_digest(desc, p, blen, out);
 
+        sg_init_table(sg, 1);
+
         local_bh_disable();
         local_irq_disable();