Changeset 1944

Timestamp:

08/18/2007 09:44:08 AM (14 months ago)

Author:

jan

Message:

fixed possible overflow in unix-socket path checks on BSD (#713)

- use sizeof(sun_path) instead of UNIX_PATH_MAX which might not be

defined

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/mod_fastcgi.c (modified) (2 diffs)
• src/mod_scgi.c (modified) (2 diffs)
• src/spawn-fcgi.c (modified) (3 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -17 +17 @@
   * fixed endless loop on shrinked files with sendfile() on BSD (#1289)
   * fixed counter overrun in ?auto in mod_status (#909)
-  * fixed too aggresive caching of nested conditionals 
+  * fixed too aggresive caching of nested conditionals (#41)
+  * fixed possible overflow in unix-socket path checks on BSD (#713)
   * removed config-check if passwd files exist (#1188)
   

branches/lighttpd-1.4.x/src/mod_fastcgi.c

@@ -42 +42 @@
 
 #include "sys-socket.h"
-
-
-#ifndef UNIX_PATH_MAX
-# define UNIX_PATH_MAX 108
-#endif
 
 #ifdef HAVE_SYS_UIO_H
@@ -1255 +1250 @@
                                         if (!buffer_is_empty(host->unixsocket)) {
                                                 /* unix domain socket */
-
-                                                if (host->unixsocket->used > UNIX_PATH_MAX - 2) {
+                                                struct sockaddr_un un;
+
+                                                if (host->unixsocket->used > sizeof(un.sun_path) - 2) {
                                                         log_error_write(srv, __FILE__, __LINE__, "sbsbsbs",
                                                                         "unixsocket is too long in:",

branches/lighttpd-1.4.x/src/mod_scgi.c

@@ -31 +31 @@
 
 #include "sys-socket.h"
-
-
-#ifndef UNIX_PATH_MAX
-# define UNIX_PATH_MAX 108
-#endif
 
 #ifdef HAVE_SYS_UIO_H
@@ -1028 +1023 @@
                                         if (!buffer_is_empty(df->unixsocket)) {
                                                 /* unix domain socket */
-
-                                                if (df->unixsocket->used > UNIX_PATH_MAX - 2) {
+                                                struct sockaddr_un un;
+
+                                                if (df->unixsocket->used > sizeof(un.sun_path) - 2) {
                                                         log_error_write(srv, __FILE__, __LINE__, "s",
                                                                         "path of the unixdomain socket is too large");

branches/lighttpd-1.4.x/src/spawn-fcgi.c

@@ -25 +25 @@
 
 #define FCGI_LISTENSOCK_FILENO 0
-
-#ifndef UNIX_PATH_MAX
-# define UNIX_PATH_MAX 108
-#endif
 
 #include "sys-socket.h"
@@ -274 +270 @@
         int pid_fd = -1;
         int nofork = 0;
+        struct sockaddr_un un;
+        const size_t sun_path_len = sizeof(un.sun_path);
 
         i_am_root = (getuid() == 0);
@@ -310 +308 @@
         }
 
-        if (unixsocket && strlen(unixsocket) > UNIX_PATH_MAX - 1) {
+        if (unixsocket && strlen(unixsocket) > sun_path_len - 1) {
                 fprintf(stderr, "%s.%d: %s\n",
                         __FILE__, __LINE__,