From owner-svn-src-releng@FreeBSD.ORG  Mon Apr 29 20:15:48 2013
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7DADDB46;
 Mon, 29 Apr 2013 20:15:48 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7009B1D4B;
 Mon, 29 Apr 2013 20:15:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3TKFmWw065758;
 Mon, 29 Apr 2013 20:15:48 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3TKFmfR065757;
 Mon, 29 Apr 2013 20:15:48 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201304292015.r3TKFmfR065757@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Mon, 29 Apr 2013 20:15:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r250059 - releng/8.3/sys/fs/nfsserver
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Apr 2013 20:15:48 -0000

Author: des
Date: Mon Apr 29 20:15:47 2013
New Revision: 250059
URL: http://svnweb.freebsd.org/changeset/base/250059

Log:
  Fix a bug that allows NFS clients to issue READDIR on files.
  
  PR:		kern/178016
  Security:	CVE-2013-3266
  Security:	FreeBSD-SA-13:05.nfsserver
  Approved by:	so

Modified:
  releng/8.3/sys/fs/nfsserver/nfs_nfsdport.c

Modified: releng/8.3/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- releng/8.3/sys/fs/nfsserver/nfs_nfsdport.c	Mon Apr 29 20:15:43 2013	(r250058)
+++ releng/8.3/sys/fs/nfsserver/nfs_nfsdport.c	Mon Apr 29 20:15:47 2013	(r250059)
@@ -1568,6 +1568,8 @@ nfsrvd_readdir(struct nfsrv_descript *nd
 			nd->nd_repstat = NFSERR_BAD_COOKIE;
 #endif
 	}
+	if (!nd->nd_repstat && vp->v_type != VDIR)
+		nd->nd_repstat = NFSERR_NOTDIR;
 	if (nd->nd_repstat == 0 && cnt == 0) {
 		if (nd->nd_flag & ND_NFSV2)
 			/* NFSv2 does not have NFSERR_TOOSMALL */