|
 |
5e7041 |
diff -up cups-1.6.3/scheduler/client.c.CVE-2014-5029-5030-5031 cups-1.6.3/scheduler/client.c
|
|
|
5e7041 |
--- cups-1.6.3/scheduler/client.c.CVE-2014-5029-5030-5031 2014-09-02 11:42:02.465900694 +0100
|
|
|
5e7041 |
+++ cups-1.6.3/scheduler/client.c 2014-09-02 11:42:44.383119863 +0100
|
|
|
5e7041 |
@@ -3180,7 +3180,7 @@ get_file(cupsd_client_t *con, /* I - C
|
|
|
5e7041 |
* then fallback to the default one...
|
|
|
5e7041 |
*/
|
|
|
5e7041 |
|
|
|
5e7041 |
- if ((status = stat(filename, filestats)) != 0 && language[0] &&
|
|
|
5e7041 |
+ if ((status = lstat(filename, filestats)) != 0 && language[0] &&
|
|
|
5e7041 |
strncmp(con->uri, "/icons/", 7) &&
|
|
|
5e7041 |
strncmp(con->uri, "/ppd/", 5) &&
|
|
|
5e7041 |
strncmp(con->uri, "/rss/", 5) &&
|
|
|
5e7041 |
@@ -3278,13 +3278,13 @@ get_file(cupsd_client_t *con, /* I - C
|
|
|
5e7041 |
plen = len - (ptr - filename);
|
|
|
5e7041 |
|
|
|
5e7041 |
strlcpy(ptr, "index.html", plen);
|
|
|
5e7041 |
- status = stat(filename, filestats);
|
|
|
5e7041 |
+ status = lstat(filename, filestats);
|
|
|
5e7041 |
|
|
|
5e7041 |
#ifdef HAVE_JAVA
|
|
|
5e7041 |
if (status)
|
|
|
5e7041 |
{
|
|
|
5e7041 |
strlcpy(ptr, "index.class", plen);
|
|
|
5e7041 |
- status = stat(filename, filestats);
|
|
|
5e7041 |
+ status = lstat(filename, filestats);
|
|
|
5e7041 |
}
|
|
|
5e7041 |
#endif /* HAVE_JAVA */
|
|
|
5e7041 |
|
|
|
5e7041 |
@@ -3292,7 +3292,7 @@ get_file(cupsd_client_t *con, /* I - C
|
|
|
5e7041 |
if (status)
|
|
|
5e7041 |
{
|
|
|
5e7041 |
strlcpy(ptr, "index.pl", plen);
|
|
|
5e7041 |
- status = stat(filename, filestats);
|
|
|
5e7041 |
+ status = lstat(filename, filestats);
|
|
|
5e7041 |
}
|
|
|
5e7041 |
#endif /* HAVE_PERL */
|
|
|
5e7041 |
|
|
|
5e7041 |
@@ -3300,7 +3300,7 @@ get_file(cupsd_client_t *con, /* I - C
|
|
|
5e7041 |
if (status)
|
|
|
5e7041 |
{
|
|
|
5e7041 |
strlcpy(ptr, "index.php", plen);
|
|
|
5e7041 |
- status = stat(filename, filestats);
|
|
|
5e7041 |
+ status = lstat(filename, filestats);
|
|
|
5e7041 |
}
|
|
|
5e7041 |
#endif /* HAVE_PHP */
|
|
|
5e7041 |
|
|
|
5e7041 |
@@ -3308,18 +3308,39 @@ get_file(cupsd_client_t *con, /* I - C
|
|
|
5e7041 |
if (status)
|
|
|
5e7041 |
{
|
|
|
5e7041 |
strlcpy(ptr, "index.pyc", plen);
|
|
|
5e7041 |
- status = stat(filename, filestats);
|
|
|
5e7041 |
+ status = lstat(filename, filestats);
|
|
|
5e7041 |
}
|
|
|
5e7041 |
|
|
|
5e7041 |
if (status)
|
|
|
5e7041 |
{
|
|
|
5e7041 |
strlcpy(ptr, "index.py", plen);
|
|
|
5e7041 |
- status = stat(filename, filestats);
|
|
|
5e7041 |
+ status = lstat(filename, filestats);
|
|
|
5e7041 |
}
|
|
|
5e7041 |
#endif /* HAVE_PYTHON */
|
|
|
5e7041 |
|
|
|
5e7041 |
}
|
|
|
5e7041 |
while (status && language[0]);
|
|
|
5e7041 |
+
|
|
|
5e7041 |
+ /*
|
|
|
5e7041 |
+ * If we've found a symlink, 404 the sucker to avoid disclosing information.
|
|
|
5e7041 |
+ */
|
|
|
5e7041 |
+
|
|
|
5e7041 |
+ if (!status && S_ISLNK(filestats->st_mode))
|
|
|
5e7041 |
+ {
|
|
|
5e7041 |
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Client %d] Symlinks such as \"%s\" are not allowed.", con->http.fd, filename);
|
|
|
5e7041 |
+ return (NULL);
|
|
|
5e7041 |
+ }
|
|
|
5e7041 |
+
|
|
|
5e7041 |
+ /*
|
|
|
5e7041 |
+ * Similarly, if the file/directory does not have world read permissions, do
|
|
|
5e7041 |
+ * not allow access...
|
|
|
5e7041 |
+ */
|
|
|
5e7041 |
+
|
|
|
5e7041 |
+ if (!status && !(filestats->st_mode & S_IROTH))
|
|
|
5e7041 |
+ {
|
|
|
5e7041 |
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Client %d] Files/directories such as \"%s\" must be world-readable.", con->http.fd, filename);
|
|
|
5e7041 |
+ return (NULL);
|
|
|
5e7041 |
+ }
|
|
|
5e7041 |
}
|
|
|
5e7041 |
|
|
|
5e7041 |
cupsdLogMessage(CUPSD_LOG_DEBUG2,
|