diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c
index 2aec457057..b00f7aee3c 100644
--- a/drivers/filesystems/fastfat/dirwr.c
+++ b/drivers/filesystems/fastfat/dirwr.c
@@ -439,6 +439,12 @@ FATAddEntry(
 
     DPRINT("addEntry: Name='%wZ', Dir='%wZ'\n", NameU, &ParentFcb->PathNameU);
 
+    if ((wcscmp(NameU->Buffer, L".") == 0) || (wcscmp(NameU->Buffer, L"..") == 0))
+    {
+        DPRINT("Filename is DOT or DOT-DOT only.\n");
+        return STATUS_OBJECT_NAME_INVALID;
+    }
+
     DirContext.LongNameU = *NameU;
     IsDirectory = BooleanFlagOn(RequestedOptions, FILE_DIRECTORY_FILE);