From owner-svn-src-head@FreeBSD.ORG  Fri May 22 16:41:33 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B4E6106566C;
	Fri, 22 May 2009 16:41:33 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 796468FC12;
	Fri, 22 May 2009 16:41:33 +0000 (UTC)
	(envelope-from rmacklem@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 n4MGfXP1012381;
	Fri, 22 May 2009 16:41:33 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4MGfXX9012380;
	Fri, 22 May 2009 16:41:33 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <200905221641.n4MGfXX9012380@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Fri, 22 May 2009 16:41:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192588 - head/sys/fs/nfsserver
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 22 May 2009 16:41:34 -0000

Author: rmacklem
Date: Fri May 22 16:41:33 2009
New Revision: 192588
URL: http://svn.freebsd.org/changeset/base/192588

Log:
  Change the reboot panic that would have occurred if clientid
  numbers wrapped around to a printf() warning of a possible
  DOS attack, in the experimental nfsv4 server.
  
  Approved by:	kib (mentor)

Modified:
  head/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c	Fri May 22 16:11:00 2009	(r192587)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c	Fri May 22 16:41:33 2009	(r192588)
@@ -3705,12 +3705,8 @@ nfsrv_nextclientindex(void)
 	if (client_index != 0)
 		return (client_index);
 
-	/*
-	 * In practice we'll never get here, but the panic is here
-	 * just for fun. (client_index will not wrap around on any real server)
-	 */
-	panic("nfsv4 server out of clientids");
-	return (0);	/* Just to shut the compiler up */
+	printf("out of clientids, possible DOS attack\n");
+	return (client_index);
 }
 
 /*