Author: pfg
Date: Fri Jul 31 01:12:31 2015
New Revision: 286102
URL: https://svnweb.freebsd.org/changeset/base/286102

Log:
  Buffer overflow in wall(1).
  
  This affected syslogd, wall and talkd.
  Detected by FORTIFY_SOURCE GSoC (with clang).
  
  Submitted by: Oliver Pinter
  Differential Revision:        https://reviews.freebsd.org/D3254
  Reviewed by:  delphij, jmg
  MFC after:    3 days

Modified:
  head/usr.bin/wall/ttymsg.c

Modified: head/usr.bin/wall/ttymsg.c
==============================================================================
--- head/usr.bin/wall/ttymsg.c  Fri Jul 31 00:31:52 2015        (r286101)
+++ head/usr.bin/wall/ttymsg.c  Fri Jul 31 01:12:31 2015        (r286102)
@@ -62,7 +62,7 @@ ttymsg(struct iovec *iov, int iovcnt, co
        struct iovec localiov[7];
        ssize_t left, wret;
        int cnt, fd;
-       static char device[MAXNAMLEN] = _PATH_DEV;
+       char device[MAXNAMLEN] = _PATH_DEV;
        static char errbuf[1024];
        char *p;
        int forked;
@@ -71,8 +71,8 @@ ttymsg(struct iovec *iov, int iovcnt, co
        if (iovcnt > (int)(sizeof(localiov) / sizeof(localiov[0])))
                return ("too many iov's (change code in wall/ttymsg.c)");
 
+       strlcat(device, line, sizeof(device));
        p = device + sizeof(_PATH_DEV) - 1;
-       strlcpy(p, line, sizeof(device));
        if (strncmp(p, "pts/", 4) == 0)
                p += 4;
        if (strchr(p, '/') != NULL) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to