1 files changed, 7 insertions, 1 deletions

diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index b04c090551649..82d8f00f7c01d 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -990,8 +990,14 @@ unionfs_check_rmdir(struct vnode *vp, struct ucred *cred, struct thread *td)
 		uio.uio_resid = iov.iov_len;
 
 		error = VOP_READDIR(lvp, &uio, cred, &eofflag, NULL, NULL);
-		if (error)
+		if (error != 0)
 			break;
+		if (eofflag == 0 && uio.uio_resid == sizeof(buf)) {
+#ifdef DIAGNOSTIC
+			panic("bad readdir response from lower FS.");
+#endif
+			break;
+		}
 
 		edp = (struct dirent*)&buf[sizeof(buf) - uio.uio_resid];
 		for (dp = (struct dirent*)buf; !error && dp < edp;