From owner-svn-src-head@FreeBSD.ORG  Sun Mar  2 03:34:07 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B1C9BA25;
 Sun,  2 Mar 2014 03:34:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9C1521566;
 Sun,  2 Mar 2014 03:34:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s223Y7UR024967;
 Sun, 2 Mar 2014 03:34:07 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s223Y7lG024966;
 Sun, 2 Mar 2014 03:34:07 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201403020334.s223Y7lG024966@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 2 Mar 2014 03:34:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262679 - head/contrib/telnet/telnetd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Mar 2014 03:34:07 -0000

Author: marcel
Date: Sun Mar  2 03:34:06 2014
New Revision: 262679
URL: http://svnweb.freebsd.org/changeset/base/262679

Log:
  Improve upon previous commit:
  1.  Check return of mmap(2) (*)
  2.  Avoid FD leak when fstat fails.
  3.  Fix style(9).
  
  (*) Pointed out by jmg@

Modified:
  head/contrib/telnet/telnetd/telnetd.c

Modified: head/contrib/telnet/telnetd/telnetd.c
==============================================================================
--- head/contrib/telnet/telnetd/telnetd.c	Sun Mar  2 02:52:34 2014	(r262678)
+++ head/contrib/telnet/telnetd/telnetd.c	Sun Mar  2 03:34:06 2014	(r262679)
@@ -926,14 +926,15 @@ telnet(int f, int p, char *host)
 	if (hostinfo && *IM)
 		putf(IM, ptyibuf2);
 	if (IF && if_fd != -1) {
-	    if(fstat (if_fd, &statbuf)!=-1) {
-		if (statbuf.st_size > 0) {
-		    if_buf = (char *) mmap (0, statbuf.st_size, PROT_READ, 0, if_fd, 0);
-		    putf(if_buf, ptyibuf2);
-		    munmap (if_buf, statbuf.st_size);
+		if (fstat(if_fd, &statbuf) != -1 && statbuf.st_size > 0) {
+			if_buf = (char *) mmap (0, statbuf.st_size,
+			    PROT_READ, 0, if_fd, 0);
+			if (if_buf != MAP_FAILED) {
+				putf(if_buf, ptyibuf2);
+				munmap(if_buf, statbuf.st_size);
+			}
 		}
 		close (if_fd);
-	    }
 	}
 
 	if (pcc)