krb5 commit: Fix memory leak in db2 policy DB initialization

Greg Hudson ghudson at mit.edu
Wed Aug 10 13:51:32 EDT 2016


https://github.com/krb5/krb5/commit/f53160634dd5de41c12701ade9e59d4b4dcd645b
commit f53160634dd5de41c12701ade9e59d4b4dcd645b
Author: Greg Hudson <ghudson at mit.edu>
Date:   Fri Jun 24 12:33:05 2016 -0400

    Fix memory leak in db2 policy DB initialization
    
    osa_adb_init_db() maintains a static linked list mapping filenames to
    lock structures.  Entries are never removed from the list; when their
    reference counts hit 0, the lockfile is closed but the filename
    remains allocated.  However, the filename is allocated each time the
    lockfile is re-opened, leaking the old value.  Fix this leak by moving
    filename initialization to entry creation.
    
    ticket: 8432 (new)
    target_version: 1.14-next
    tags: pullup

 src/plugins/kdb/db2/adb_openclose.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/plugins/kdb/db2/adb_openclose.c b/src/plugins/kdb/db2/adb_openclose.c
index d9d4cee..7db30a3 100644
--- a/src/plugins/kdb/db2/adb_openclose.c
+++ b/src/plugins/kdb/db2/adb_openclose.c
@@ -131,6 +131,12 @@ osa_adb_init_db(osa_adb_db_t *dbp, char *filename, char *lockfilename,
             return ENOMEM;
         }
         memset(lockp, 0, sizeof(*lockp));
+        lockp->lockinfo.filename = strdup(lockfilename);
+        if (lockp->lockinfo.filename == NULL) {
+            free(lockp);
+            free(db);
+            return ENOMEM;
+        }
         lockp->next = locklist;
         locklist = lockp;
     }
@@ -146,7 +152,6 @@ osa_adb_init_db(osa_adb_db_t *dbp, char *filename, char *lockfilename,
          * needs be open read/write so that write locking can work with
          * POSIX systems
          */
-        lockp->lockinfo.filename = strdup(lockfilename);
         if ((lockp->lockinfo.lockfile = fopen(lockfilename, "r+")) == NULL) {
             /*
              * maybe someone took away write permission so we could only


More information about the cvs-krb5 mailing list