From owner-svn-src-all@FreeBSD.ORG  Thu Jan 20 09:39:17 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 309451065679;
	Thu, 20 Jan 2011 09:39:17 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D91D8FC17;
	Thu, 20 Jan 2011 09:39:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0K9dHDd008101;
	Thu, 20 Jan 2011 09:39:17 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0K9dGXm008098;
	Thu, 20 Jan 2011 09:39:16 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201101200939.p0K9dGXm008098@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 20 Jan 2011 09:39:16 +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: r217633 - head/sys/fs/tmpfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 20 Jan 2011 09:39:17 -0000

Author: kib
Date: Thu Jan 20 09:39:16 2011
New Revision: 217633
URL: http://svn.freebsd.org/changeset/base/217633

Log:
  In tmpfs_readdir(), normalize handling of the directory entries that
  either overflow the supplied buffer, or cause uiomove fail.
  Do not advance cached de when directory entry was not copied out.
  Do not return EOF when no entries could be copied due to first entry
  too large for supplied buffer, signal EINVAL instead.
  
  Reported by:	Beat G?tzi <beat chruetertee ch>
  MFC after:	1 week

Modified:
  head/sys/fs/tmpfs/tmpfs_subr.c
  head/sys/fs/tmpfs/tmpfs_vnops.c

Modified: head/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_subr.c	Thu Jan 20 09:37:53 2011	(r217632)
+++ head/sys/fs/tmpfs/tmpfs_subr.c	Thu Jan 20 09:39:16 2011	(r217633)
@@ -827,9 +827,10 @@ tmpfs_dir_getdents(struct tmpfs_node *no
 		/* Copy the new dirent structure into the output buffer and
 		 * advance pointers. */
 		error = uiomove(&d, d.d_reclen, uio);
-
-		(*cntp)++;
-		de = TAILQ_NEXT(de, td_entries);
+		if (error == 0) {
+			(*cntp)++;
+			de = TAILQ_NEXT(de, td_entries);
+		}
 	} while (error == 0 && uio->uio_resid > 0 && de != NULL);
 
 	/* Update the offset and cache. */

Modified: head/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vnops.c	Thu Jan 20 09:37:53 2011	(r217632)
+++ head/sys/fs/tmpfs/tmpfs_vnops.c	Thu Jan 20 09:39:16 2011	(r217633)
@@ -1349,7 +1349,7 @@ outok:
 	MPASS(error >= -1);
 
 	if (error == -1)
-		error = 0;
+		error = (cnt != 0) ? 0 : EINVAL;
 
 	if (eofflag != NULL)
 		*eofflag =