From owner-svn-src-projects@FreeBSD.ORG  Wed Oct 22 01:13:32 2008
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 290191065670;
	Wed, 22 Oct 2008 01:13:32 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1782F8FC24;
	Wed, 22 Oct 2008 01:13:32 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9M1DVJm013292;
	Wed, 22 Oct 2008 01:13:31 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9M1DVKe013290;
	Wed, 22 Oct 2008 01:13:31 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200810220113.m9M1DVKe013290@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Wed, 22 Oct 2008 01:13:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184149 - projects/tcp_cc_8.x/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Oct 2008 01:13:32 -0000

Author: lstewart
Date: Wed Oct 22 01:13:31 2008
New Revision: 184149
URL: http://svn.freebsd.org/changeset/base/184149

Log:
  Fix a bug I just noticed in the way the TCP_CONGESTION getsockopt() code worked.
  memcpy() had the args around the wrong way and was the wrong thing to use there
  anyway.
  
  Also switch the other strncpy use in the patch over to strlcpy whilst I'm at it.

Modified:
  projects/tcp_cc_8.x/sys/netinet/cc.c
  projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c

Modified: projects/tcp_cc_8.x/sys/netinet/cc.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/cc.c	Wed Oct 22 00:22:32 2008	(r184148)
+++ projects/tcp_cc_8.x/sys/netinet/cc.c	Wed Oct 22 01:13:31 2008	(r184149)
@@ -164,7 +164,7 @@ cc_init()
 	cc_register_algorithm(&newreno_cc_algo);
 
 	/* set newreno to the system default */
-	strncpy(cc_algorithm, newreno_cc_algo.name, sizeof(cc_algorithm));
+	strlcpy(cc_algorithm, newreno_cc_algo.name, TCP_CA_NAME_MAX);
 }
 
 /*

Modified: projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c
==============================================================================
--- projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c	Wed Oct 22 00:22:32 2008	(r184148)
+++ projects/tcp_cc_8.x/sys/netinet/tcp_usrreq.c	Wed Oct 22 01:13:31 2008	(r184149)
@@ -1490,7 +1490,7 @@ tcp_ctloutput(struct socket *so, struct 
 			break;
 		case TCP_CONGESTION:
 			bzero(buf, sizeof(buf));
-			memcpy(&(CC_ALGO(tp)->name), buf, TCP_CA_NAME_MAX);
+			strlcpy(buf, CC_ALGO(tp)->name, TCP_CA_NAME_MAX);
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, buf, TCP_CA_NAME_MAX);
 			break;