diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c
index 86cd3be9a27..868e8d47dbb 100644
--- a/stand/libsa/ufs.c
+++ b/stand/libsa/ufs.c
@@ -891,6 +891,12 @@ ufs_readdir(struct open_file *f, struct dirent *d)
 		if (error)
 			return (error);
 		dp = (struct direct *)buf;
+		/*
+		 * Check for corrupt directory entry and bail out rather
+		 * than spin forever hoping that the user has other options.
+		 */
+		if (dp->d_reclen == 0)
+			return (0);
 		fp->f_seekp += dp->d_reclen;
 	} while (dp->d_ino == (ino_t)0);
 
diff --git a/stand/libsa/ufsread.c b/stand/libsa/ufsread.c
index 0f9b9bb4e2f..86ac8fbbbab 100644
--- a/stand/libsa/ufsread.c
+++ b/stand/libsa/ufsread.c
@@ -108,6 +108,13 @@ fsfind(const char *name, ufs_ino_t * ino)
 				*ino = d.d_ino;
 				return d.d_type;
 			}
+			/*
+			 * Check for corrupt directory entry and bail out
+			 * rather than spin forever hoping that the user
+			 * has other options.
+			 */
+			if (d.d_reclen == 0)
+				return 0;
 			s += d.d_reclen;
 		}
 	if (n != -1 && ls)