1 files changed, 22 insertions, 6 deletions

diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 9d70289f7df3..bbed2fd40fdc 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -115,11 +115,29 @@ static int ecryptfs_calculate_md5(char *dst,
                 }
                 crypt_stat->hash_tfm = desc.tfm;
         }
-        crypto_hash_init(&desc);
-        crypto_hash_update(&desc, &sg, len);
-        crypto_hash_final(&desc, dst);
-        mutex_unlock(&crypt_stat->cs_hash_tfm_mutex);
+        rc = crypto_hash_init(&desc);
+        if (rc) {
+                printk(KERN_ERR
+                       "%s: Error initializing crypto hash; rc = [%d]\n",
+                       __FUNCTION__, rc);
+                goto out;
+        }
+        rc = crypto_hash_update(&desc, &sg, len);
+        if (rc) {
+                printk(KERN_ERR
+                       "%s: Error updating crypto hash; rc = [%d]\n",
+                       __FUNCTION__, rc);
+                goto out;
+        }
+        rc = crypto_hash_final(&desc, dst);
+        if (rc) {
+                printk(KERN_ERR
+                       "%s: Error finalizing crypto hash; rc = [%d]\n",
+                       __FUNCTION__, rc);
+                goto out;
+        }
 out:
+        mutex_unlock(&crypt_stat->cs_hash_tfm_mutex);
         return rc;
 }
 
@@ -504,7 +522,6 @@ int ecryptfs_encrypt_page(struct page *page)
                                         "\n", rc);
                         goto out;
                 }
-                extent_offset++;
         }
 out:
         kfree(enc_extent_virt);
@@ -640,7 +657,6 @@ int ecryptfs_decrypt_page(struct page *page)
                                "rc = [%d]\n", __FUNCTION__, rc);
                         goto out;
                 }
-                extent_offset++;
         }
 out:
         kfree(enc_extent_virt);