From aa031ef4a38afa97cbf8a03fb3b5cf97fe298e08 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 30 Nov 2017 08:28:17 +0000
Subject: Prevent OOB access on corrupted msdos directories.

Submitted by:	Veo Zhang <veo live com>
MFC after:	2 weeks
---
 sbin/fsck_msdosfs/dir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sbin/fsck_msdosfs/dir.c')

diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index a57a39ef2018..38c70144d679 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -621,7 +621,7 @@ readDosDirSection(int f, struct bootblock *boot, struct fatEntry *fat,
 			dirent.name[8] = '\0';
 			for (k = 7; k >= 0 && dirent.name[k] == ' '; k--)
 				dirent.name[k] = '\0';
-			if (dirent.name[k] != '\0')
+			if (k < 0 || dirent.name[k] != '\0')
 				k++;
 			if (dirent.name[0] == SLOT_E5)
 				dirent.name[0] = 0xe5;
-- 
cgit v1.2.3