commit e22b21af3a4d7729c23f559add26bc4f78cbaab1
author Elliott Hughes <enh@google.com> Thu Feb 05 18:51:07 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 05 18:51:07 2015 +0000
tree 55d8510b453c570bee53163d4d68b59fc6c99179
parent ef87a17a2a985645245357c7eddcc80033b18db4
parent ebc83b3e8ef6d0dbab84bec88e0231c7911e5378

am ebc83b3e: Merge "Fix memory leak in upgrade_crypt_ftr"

* commit 'ebc83b3e8ef6d0dbab84bec88e0231c7911e5378':
  Fix memory leak in upgrade_crypt_ftr

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 88e0ead..450c682 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -574,6 +574,7 @@
         /* Need to initialize the persistent data area */
         if (lseek64(fd, pdata_offset, SEEK_SET) == -1) {
             SLOGE("Cannot seek to persisent data offset\n");
+            free(pdata);
             return;
         }
         /* Write all zeros to the first copy, making it invalid */
@@ -588,6 +589,7 @@
         crypt_ftr->persist_data_offset[0] = pdata_offset;
         crypt_ftr->persist_data_offset[1] = pdata_offset + CRYPT_PERSIST_DATA_SIZE;
         crypt_ftr->minor_version = 1;
+        free(pdata);
     }
 
     if ((crypt_ftr->major_version == 1) && (crypt_ftr->minor_version == 1)) {