Changeset 118 for trunk

Timestamp:

Sep 4, 2007, 8:46:32 PM (17 years ago)

Author:

rainer

Message:

Fix for ticket #74 (local DoS attack on yule on BSD systems lacking the getpeereid() call).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_socket.c (modified) (1 diff)

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.3.5)
+AM_INIT_AUTOMAKE(samhain, 2.3.6)
 AC_CANONICAL_HOST
 

trunk/docs/Changelog

@@ -1 +1 @@
 2.3.6:
+        * fix local DoS attack on BSD systems lacking getpeereid() (reported
+          by Rob Holland).
         * fix yulectl password reading from $HOME/.yulectl_cred, erroneously
           rejected passwords with exactly 14 chars (reported by Jerry Brown)

trunk/src/sh_socket.c

@@ -678 +678 @@
                       _("Message from recvmsg() was not SCM_CREDS"), 
                       _("sh_socket_read"));
+
+      /* Check for file descriptors sent using SCM_RIGHTS, and
+       * close them. If MSG_CTRUNC is set, the buffer was too small,
+       * and no fds are duped.
+       */
+      if (msg.msg_controllen >= sizeof(struct cmsghdr) &&
+          (msg.msg_flags & MSG_CTRUNC) == 0)
+        {
+          unsigned int     data_size;
+          unsigned int     data_i;
+          int              fdcount, fdmax;
+          struct cmsghdr * cmptr;
+          int              fdsbuf[1 + (sizeof(cmsgmem)/sizeof(int))];
+
+          for (cmptr = CMSG_FIRSTHDR(&msg); cmptr != NULL;
+               cmptr = CMSG_NXTHDR(&msg, cmptr)) 
+            {
+              if (cmptr->cmsg_len > sizeof (cmsgmem) || 
+                  cmptr->cmsg_level != SOL_SOCKET ||
+                  cmptr->cmsg_type  != SCM_RIGHTS)
+                continue;
+
+              /* Crappy way of finding the data length.
+               * cmptr->cmsg_len includes both header and padding,
+               * how are you supposed to find the data length?
+               * cmptr->cmsg_len - ALIGN(sizeof(struct cmsghdr)) ?
+               */
+              data_size = 0;
+
+              for (data_i = 0; data_i < cmptr->cmsg_len; ++data_i)
+                {
+                  if (CMSG_LEN(data_i) == cmptr->cmsg_len)
+                    {
+                      data_size = data_i;
+                      break;
+                    }
+                }
+              memcpy(fdsbuf, CMSG_DATA(cmptr), data_size);
+              fdmax = data_size / sizeof(int);
+              for (fdcount = 0; fdcount < fdmax; ++fdcount)
+                (void) close(fdsbuf[fdcount]);
+            }
+        }
+      
       close(talkfd);
       return -1;