svn commit: r281962 - head/sys/fs/nfsserver

[Rick Macklem]

Author: rmacklem
Date: Sat Apr 25 00:58:24 2015
New Revision: 281962
URL: https://svnweb.freebsd.org/changeset/base/281962

Log:
  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.
  
  Tested by:	thmu at freenet.de
  MFC after:	1 week

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

Modified: head/sys/fs/nfsserver/nfs_nfsdkrpc.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdkrpc.c	Sat Apr 25 00:58:19 2015	(r281961)
+++ head/sys/fs/nfsserver/nfs_nfsdkrpc.c	Sat Apr 25 00:58:24 2015	(r281962)
@@ -117,7 +117,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;