From p@i609a.hadiko.de  Sat Jan  4 10:56:50 2003
Return-Path: <p@i609a.hadiko.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A8E8837B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Jan 2003 10:56:50 -0800 (PST)
Received: from mailgate.rz.uni-karlsruhe.de (mailgate.rz.uni-karlsruhe.de [129.13.64.97])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F303243ED4
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Jan 2003 10:56:48 -0800 (PST)
	(envelope-from p@i609a.hadiko.de)
Received: from nce2.hadiko.de (root@hadince2.hadiko.uni-karlsruhe.de [172.20.32.2])
	by mailgate.rz.uni-karlsruhe.de with esmtp (Exim 3.36 #1)
	id 18UtTT-0004Gz-00; Sat, 04 Jan 2003 19:56:47 +0100
Received: from i609a.hadiko.de (hadii609a.hadiko.uni-karlsruhe.de [172.20.49.159])
	by nce2.hadiko.de (8.12.3/8.12.3/Debian -4) with ESMTP id h04IukCj004155
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 4 Jan 2003 19:56:47 +0100
Received: from i609a.hadiko.de (localhost [127.0.0.1])
	by i609a.hadiko.de (8.12.6/8.12.6) with ESMTP id h04Iukw3003229
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 4 Jan 2003 19:56:46 +0100 (CET)
	(envelope-from p@i609a.hadiko.de)
Received: (from p@localhost)
	by i609a.hadiko.de (8.12.6/8.12.6/Submit) id h04Iuk4q003228;
	Sat, 4 Jan 2003 19:56:46 +0100 (CET)
Message-Id: <200301041856.h04Iuk4q003228@i609a.hadiko.de>
Date: Sat, 4 Jan 2003 19:56:46 +0100 (CET)
From: Philipp Mergenthaler <philipp.mergenthaler@stud.uni-karlsruhe.de>
Reply-To: Philipp Mergenthaler <philipp.mergenthaler@stud.uni-karlsruhe.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: buffer overflow by strcpy() in natd's argv handling
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         46761
>Category:       bin
>Synopsis:       buffer overflow by strcpy() in natd's argv handling
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    hmp
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 04 11:00:12 PST 2003
>Closed-Date:    Mon May 10 15:34:13 PDT 2004
>Last-Modified:  Mon May 10 15:34:13 PDT 2004
>Originator:     Philipp Mergenthaler
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
University of Karlsruhe, Germany
>Environment:
System: FreeBSD i609a.hadiko.de 5.0-CURRENT FreeBSD 5.0-CURRENT #618: Tue Dec 31 23:18:58 CET 2002 p@i609a.hadiko.de:/usr/obj/usr/src/sys/I609 i386


	
>Description:
In src/sbin/natd/natd.c:ParseArgs() the command line arguments are asembled
into char parmBuf[256], which is then passed to ParseOption().
There it is passed (via char *strValue) to SetupPortRedirect(),
SetupProtoRedirect() or SetupAddressRedirect(), respectively.
In each of those we have:

        char            buf[128];
[...]
        strcpy (buf, parms);

which copies up to 256 chars into buf.


	
>How-To-Repeat:
	
>Fix:

In addition to replacing the strcpy()s with strlcpy() maybe those
"magic number" buffer sizes could be replaced with a macro.

Index: natd.c
===================================================================
RCS file: /ncvs/src/sbin/natd/natd.c,v
retrieving revision 1.39
diff -u -r1.39 natd.c
--- natd.c	15 Jan 2002 17:07:56 -0000	1.39
+++ natd.c	4 Jan 2003 18:25:57 -0000
@@ -1351,7 +1351,7 @@
 	int             i;
 	struct alias_link *link = NULL;
 
-	strcpy (buf, parms);
+	strlcpy (buf, parms, sizeof(buf));
 /*
  * Extract protocol.
  */
@@ -1482,7 +1482,7 @@
 	char*		protoName;
 	struct protoent *protoent;
 
-	strcpy (buf, parms);
+	strlcpy (buf, parms, sizeof(buf));
 /*
  * Extract protocol.
  */
@@ -1536,7 +1536,7 @@
 	char*		serverPool;
 	struct alias_link *link;
 
-	strcpy (buf, parms);
+	strlcpy (buf, parms, sizeof(buf));
 /*
  * Extract local address.
  */
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->hmp 
Responsible-Changed-By: hmp 
Responsible-Changed-When: Fri Jul 18 07:57:44 PDT 2003 
Responsible-Changed-Why:  
I will liase with a src committer to get this resolved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46761 
State-Changed-From-To: open->closed 
State-Changed-By: hmp 
State-Changed-When: Mon May 10 15:34:04 PDT 2004 
State-Changed-Why:  
Patch committed.  Thanks. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=46761 
>Unformatted:
