From owner-svn-src-head@FreeBSD.ORG  Mon Oct 27 11:21:48 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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9D38D195;
 Mon, 27 Oct 2014 11:21:48 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 897206EC;
 Mon, 27 Oct 2014 11:21:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9RBLmLo095540;
 Mon, 27 Oct 2014 11:21:48 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9RBLmOv095539;
 Mon, 27 Oct 2014 11:21:48 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201410271121.s9RBLmOv095539@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 27 Oct 2014 11:21:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273733 - head/sys/netinet/cc
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.18-1
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: Mon, 27 Oct 2014 11:21:48 -0000

Author: hselasky
Date: Mon Oct 27 11:21:47 2014
New Revision: 273733
URL: https://svnweb.freebsd.org/changeset/base/273733

Log:
  Make assignments to "net.inet.tcp.cc.algorithm" work by fixing a bad
  string comparison.
  
  MFC after:	3 days
  Reported by:	Jukka Ukkonen <jau789@gmail.com>
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/netinet/cc/cc.c

Modified: head/sys/netinet/cc/cc.c
==============================================================================
--- head/sys/netinet/cc/cc.c	Mon Oct 27 10:34:09 2014	(r273732)
+++ head/sys/netinet/cc/cc.c	Mon Oct 27 11:21:47 2014	(r273733)
@@ -106,11 +106,13 @@ cc_default_algo(SYSCTL_HANDLER_ARGS)
 		/* Find algo with specified name and set it to default. */
 		CC_LIST_RLOCK();
 		STAILQ_FOREACH(funcs, &cc_list, entries) {
-			if (strncmp((char *)req->newptr, funcs->name,
-			    TCP_CA_NAME_MAX) == 0) {
-				found = 1;
-				V_default_cc_ptr = funcs;
-			}
+			/* NOTE: "newptr" is not zero terminated */
+			if (req->newlen != strlen(funcs->name))
+				continue;
+			if (bcmp(req->newptr, funcs->name, req->newlen))
+				continue;
+			found = 1;
+			V_default_cc_ptr = funcs;
 		}
 		CC_LIST_RUNLOCK();