src/usr.bin/sudo/env.c - diff

Return to env.c CVS log

Up to [local] / src / usr.bin / sudo

Diff for /src/usr.bin/sudo/Attic/env.c between version 1.25 and 1.26

-version 1.25, 2014/04/24 16:29:48
+version 1.26, 2015/02/10 12:59:01
 Line 186
 Line 186
 Line 186
      "LC_*",
      "LINGUAS",
      "TERM",
+     "TZ",
      NULL
  };
-Line 203
+Line 204
 Line 203
 Line 204
      "PATH",
      "PS1",
      "PS2",
-     "TZ",
      "XAUTHORITY",
      "XAUTHORIZATION",
      NULL
 Line 513
 Line 513
 Line 513
  }
  /*
+  * Sanity-check the TZ environment variable.
+  * On many systems it is possible to set this to a pathname.
+  */
+ static int
+ tz_is_sane(tzval)
+     const char *tzval;
+ {
+     const char *cp;
+     char lastch;
+     /* tzcode treats a value beginning with a ':' as a path. */
+     if (tzval[0] == ':')
+         tzval++;
+     /* Reject fully-qualified TZ that doesn't being with the zoneinfo dir. */
+     if (tzval[0] == '/') {
+ #ifdef _PATH_ZONEINFO
+         if (strncmp(tzval, _PATH_ZONEINFO, sizeof(_PATH_ZONEINFO) - 1) != 0 ||
+             tzval[sizeof(_PATH_ZONEINFO) - 1] != '/')
+             return FALSE;
+ #else
+         /* Assume the worst. */
+         return FALSE;
+ #endif
+     }
+     /*
+      * Make sure TZ only contains printable non-space characters
+      * and does not contain a '..' path element.
+      */
+     lastch = '/';
+     for (cp = tzval; *cp != '\0'; cp++) {
+         if (isspace((unsigned char)*cp) || !isprint((unsigned char)*cp))
+             return FALSE;
+         if (lastch == '/' && cp[0] == '.' && cp[1] == '.' &&
+             (cp[2] == '/' || cp[2] == '\0'))
+             return FALSE;
+         lastch = *cp;
+     }
+     /* Reject extra long TZ values (even if not a path). */
+     if ((size_t)(cp - tzval) >= PATH_MAX)
+         return FALSE;
+     return TRUE;
+ }
+ /*
   * Apply the env_check list.
   * Returns TRUE if the variable is allowed, FALSE if denied
   * or -1 if no match.
-Line 535
+Line 583
 Line 535
 Line 583
              iswild = FALSE;
          if (strncmp(cur->value, var, len) == 0 &&
              (iswild || var[len] == '=')) {
-             keepit = !strpbrk(var, "/%");
+             if (strncmp(var, "TZ=", 3) == 0) {
+                 /* Special case for TZ */
+                 keepit = tz_is_sane(var + 3);
+             } else {
+                 keepit = !strpbrk(var, "/%");
+             }
              break;
          }
      }