Changeset 6b1c3b6

Timestamp:

Mar 17, 2010, 10:36:59 PM (14 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

49bc81e

Parents:

4942723

git-author:

Nelson Elhage <nelhage@mit.edu> (04/13/09 20:35:25)

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/17/10 22:36:59)

Message:

zcrypt.c: Fix the zcrypt CVEs

File:

• zcrypt.c (modified) (4 diffs)

zcrypt.c

@@ -8 +8 @@
 
 #include <stdio.h>
-#if defined(vax) || defined(ibm032)
-#define pid_t int
-int waitpid(pid_t pid, int *statloc, int options)
-{
-  while (wait(statloc) != pid)
-    ;
-}
-#define STDIN_FILENO 0
-#else
+
+
 #include <unistd.h>
-#endif
 #include <sys/types.h>
 #include <des.h>
 #include <zephyr/zephyr.h>
+#include <glib.h>
 
 #define MAX_KEY 128
@@ -321 +314 @@
   int retval;
   char *keyfile;
-  char varname[MAX_SEARCH][128];
+  char *varname[MAX_SEARCH];
   int length[MAX_SEARCH], i;
   char buffer[MAX_BUFF];
-  char filename[MAX_BUFF];
+  char *filename;
   char result[MAX_SEARCH][MAX_BUFF];
   int numsearch = 0;
   FILE *fsearch;
 
+  memset(varname, 0, sizeof(varname));
+
   /* Determine names to look for in .crypt-table */
   if (instance)
-    sprintf(varname[numsearch++], "crypt-%s-%s:", (class?class:"message"), 
-            instance);
+    varname[numsearch++] = g_strdup_printf("crypt-%s-%s:", (class?class:"message"), instance);
   if (class)
-    sprintf(varname[numsearch++], "crypt-%s:", class);
-  sprintf(varname[numsearch++], "crypt-default:", class);
+    varname[numsearch++] = g_strdup_printf("crypt-%s:", class);
+  varname[numsearch++] = g_strdup("crypt-default:");
 
   /* Setup the result array, and determine string lengths */
@@ -345 +339 @@
 
   /* Open~/.crypt-table */
-  sprintf(filename, "%s/.crypt-table", getenv("HOME"));
+  filename = g_strdup_printf("%s/.crypt-table", getenv("HOME"));
   fsearch = fopen(filename, "r");
   if (fsearch)
@@ -394 +388 @@
   else
     printf("Could not open key table file: %s\n", filename);
+
+  for(i = 0; i < MAX_SEARCH; i++) {
+    if(varname[i] != NULL) {
+      g_free(varname[i]);
+    }
+  }
+
+  if(filename != NULL) {
+    g_free(filename);
+  }
 
   return keyfile;