svn commit: r282343 - stable/9/sys/fs/nfsserver

[Rick Macklem]

Author: rmacklem
Date: Sat May  2 12:58:04 2015
New Revision: 282343
URL: https://svnweb.freebsd.org/changeset/base/282343

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/9/sys/fs/nfsserver/nfs_nfsdkrpc.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c
==============================================================================
--- stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c	Sat May  2 12:22:24 2015	(r282342)
+++ stable/9/sys/fs/nfsserver/nfs_nfsdkrpc.c	Sat May  2 12:58:04 2015	(r282343)
@@ -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;