From owner-svn-src-all@FreeBSD.ORG  Sat May  2 12:18:29 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AE88ECAB;
 Sat,  2 May 2015 12:18:29 +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 9BF4A1367;
 Sat,  2 May 2015 12:18:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t42CITmr030815;
 Sat, 2 May 2015 12:18:29 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t42CITni030814;
 Sat, 2 May 2015 12:18:29 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201505021218.t42CITni030814@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sat, 2 May 2015 12:18:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r282340 - stable/10/sys/fs/nfsserver
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 May 2015 12:18:29 -0000

Author: rmacklem
Date: Sat May  2 12:18:28 2015
New Revision: 282340
URL: https://svnweb.freebsd.org/changeset/base/282340

Log:
  MFC: r281962
  Fix the NFS server's handling of a bogus NFSv2 ROOT RPC.
  The ROOT RPC is deprecated in the NFSv2 RFC, RFC-1094
  and should never be used by a client.

Modified:
  stable/10/sys/fs/nfsserver/nfs_nfsdkrpc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsserver/nfs_nfsdkrpc.c
==============================================================================
--- stable/10/sys/fs/nfsserver/nfs_nfsdkrpc.c	Sat May  2 12:08:28 2015	(r282339)
+++ stable/10/sys/fs/nfsserver/nfs_nfsdkrpc.c	Sat May  2 12:18:28 2015	(r282340)
@@ -120,7 +120,8 @@ nfssvc_program(struct svc_req *rqst, SVC
 
 	memset(&nd, 0, sizeof(nd));
 	if (rqst->rq_vers == NFS_VER2) {
-		if (rqst->rq_proc > NFSV2PROC_STATFS) {
+		if (rqst->rq_proc > NFSV2PROC_STATFS ||
+		    newnfs_nfsv3_procid[rqst->rq_proc] == NFSPROC_NOOP) {
 			svcerr_noproc(rqst);
 			svc_freereq(rqst);
 			goto out;