pppd: Limit memory accessed by string formats with max length specified

[ppp.git] / pppd / sys-solaris.c

diff --git a/pppd/sys-solaris.c b/pppd/sys-solaris.c
index fb8f0fd0e0ab4cb54e4badf2e1eadfc4ca8ea075..1d6f012c90f2fc9113461dc5d9f051fce31babc6 100644 (file)
--- a/pppd/sys-solaris.c
+++ b/pppd/sys-solaris.c
@@ -85,7 +85,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID  "$Id: sys-solaris.c,v 1.13 2004/11/04 10:02:26 paulus Exp $"
+#define RCSID  "$Id: sys-solaris.c,v 1.16 2008/01/30 14:26:53 carlsonj Exp $"
 
 #include <limits.h>
 #include <stdio.h>
@@ -166,7 +166,6 @@
 #define        UDP6_DEV_NAME   "/dev/udp6"
 #endif /* !defined(UDP6_DEV_NAME) && defined(SOL2) */
 
-static const char rcsid[] = RCSID;
 
 #if defined(SOL2)
 /*
@@ -194,16 +193,24 @@ static int        if6_is_up = 0;  /* IPv6 interface has been marked up */
        eui64_copy(eui64, s->sin6_addr.s6_addr32[2]);   \
        s->sin6_family = AF_INET6;              \
        l.lifr_addr.ss_family = AF_INET6;       \
-       l.lifr_addrlen = 10;                    \
+       l.lifr_addrlen = 64;                    \
        l.lifr_addr = laddr;                    \
        } while (0)
 
+#define _IN6A_LLX_FROM_EUI64(s, eui64, as) do {        \
+       s->s6_addr32[0] = htonl(as);    \
+       eui64_copy(eui64, s->s6_addr32[2]);     \
+       } while (0)
+
 #define IN6_LLADDR_FROM_EUI64(l, s, eui64)  \
     _IN6_LLX_FROM_EUI64(l, s, eui64, 0xfe800000)
 
 #define IN6_LLTOKEN_FROM_EUI64(l, s, eui64) \
     _IN6_LLX_FROM_EUI64(l, s, eui64, 0)
 
+#define IN6A_LLADDR_FROM_EUI64(s, eui64)  \
+    _IN6A_LLX_FROM_EUI64(s, eui64, 0xfe800000)
+
 #endif /* defined(INET6) && defined(SOL2) */
 
 #if defined(INET6) && defined(SOL2)
@@ -238,6 +245,7 @@ static int  tty_npushed;
 static int     if_is_up;       /* Interface has been marked up */
 static u_int32_t remote_addr;          /* IP address of peer */
 static u_int32_t default_route_gateway;        /* Gateway for default route added */
+static eui64_t default_route_gateway6; /* Gateway for default IPv6 route added */
 static u_int32_t proxy_arp_addr;       /* Addr for proxy arp entry added */
 
 /* Prototypes for procedures local to this file. */
@@ -787,6 +795,8 @@ sys_cleanup()
        sifdown(0);
     if (default_route_gateway)
        cifdefaultroute(0, default_route_gateway, default_route_gateway);
+    if (default_route_gateway6)
+       cif6defaultroute(0, default_route_gateway6, default_route_gateway6);
     if (proxy_arp_addr)
        cifproxyarp(0, proxy_arp_addr);
 #if defined(SOL2)
@@ -1225,6 +1235,9 @@ set_up_tty(fd, local)
     }
 #endif
 
+    if (stop_bits >= 2)
+       tios.c_cflag |= CSTOPB;
+
     tios.c_cflag |= CS8 | CREAD | HUPCL;
     if (local || !modem)
        tios.c_cflag |= CLOCAL;
@@ -1954,6 +1967,62 @@ cif6addr(u, o, h)
     return 1;
 }
 
+/*
+ * sif6defaultroute - assign a default route through the address given.
+ */
+int
+sif6defaultroute(u, l, g)
+    int u;
+    eui64_t l, g;
+{
+    struct rtentry rt;
+
+#if defined(__USLC__)
+    g = l;                     /* use the local address as gateway */
+#endif
+    memset(&rt, 0, sizeof(rt));
+    memset(&rt.rtmsg_dst, 0, sizeof(rt.rtmsg_dst));
+    rt.rtmsg_dst_len = 0;
+    IN6A_LLADDR_FROM_EUI64(&rt.rtmsg_gateway, g);
+    rt.rtmsg_flags = RTF_GATEWAY;
+
+    if (ioctl(ip6fd, SIOCADDRT, &rt) < 0) {
+       error("Can't add default route: %m");
+       return 0;
+    }
+
+    default_route_gateway6 = g;
+    return 1;
+}
+
+/*
+ * cif6defaultroute - delete a default route through the address given.
+ */
+int
+cif6defaultroute(u, l, g)
+    int u;
+    eui64_t l, g;
+{
+    struct rtentry rt;
+
+#if defined(__USLC__)
+    g = l;                     /* use the local address as gateway */
+#endif
+    memset(&rt, 0, sizeof(rt));
+    memset(&rt.rtmsg_dst, 0, sizeof(rt.rtmsg_dst));
+    rt.rtmsg_dst_len = 0;
+    IN6A_LLADDR_FROM_EUI64(&rt.rtmsg_gateway, g);
+    rt.rtmsg_flags = RTF_GATEWAY;
+
+    if (ioctl(ip6fd, SIOCDELRT, &rt) < 0) {
+       error("Can't delete default route: %m");
+       return 0;
+    }
+
+    default_route_gateway6 = 0;
+    return 1;
+}
+
 #endif /* defined(SOL2) && defined(INET6) */
 
 
@@ -2220,7 +2289,7 @@ get_hw_addr_dlpi(name, hwaddr)
     char *name;
     struct sockaddr *hwaddr;
 {
-    char *p, *q;
+    char *q;
     int unit, iffd, adrlen;
     unsigned char *adrp;
     char ifdev[24];
@@ -2465,8 +2534,13 @@ logwtmp(line, name, host)
     if (name[0] != 0) {
        /* logging in */
        strncpy(utmpx.ut_user, name, sizeof(utmpx.ut_user));
-       strncpy(utmpx.ut_id, ifname, sizeof(utmpx.ut_id));
        strncpy(utmpx.ut_line, line, sizeof(utmpx.ut_line));
+       strncpy(utmpx.ut_host, host, sizeof(utmpx.ut_host));
+       if (*host != '\0') {
+           utmpx.ut_syslen = strlen(host) + 1;
+           if (utmpx.ut_syslen > sizeof(utmpx.ut_host))
+               utmpx.ut_syslen = sizeof(utmpx.ut_host);
+       }
        utmpx.ut_pid = getpid();
        utmpx.ut_type = USER_PROCESS;
     } else {
@@ -2739,7 +2813,6 @@ get_pty(master_fdp, slave_fdp, slave_name, uid)
 {
     int mfd, sfd;
     char *pty_name;
-    struct termios tios;
 
     mfd = open("/dev/ptmx", O_RDWR);
     if (mfd < 0) {