commit ebc83b3e8ef6d0dbab84bec88e0231c7911e5378
author Elliott Hughes <enh@google.com> Thu Feb 05 17:08:58 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 05 17:08:59 2015 +0000
tree dbc334e3f0aa602a9f3cf4ed0b700b3e2708376f
parent fcca3faad48fc37be78a7307ee94b1b55cb89f16
parent 91064633ff3e5dd0a8a7d0c065cd82ba06b04ace

Merge "Fix memory leak in upgrade_crypt_ftr"

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 61c0490..1f02a14 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -568,6 +568,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 */
@@ -582,6 +583,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)) {