Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
+++ uspace/srv/fs/fat/fat_ops.c	(revision 3cc6a5200ed5c174df3efad1870dab86c9c73d13)
@@ -490,6 +490,6 @@
 	    str_cmp(d->name, FAT_NAME_DOT) == 0) {
 	   	memset(d, 0, sizeof(fat_dentry_t));
-	   	strcpy(d->name, FAT_NAME_DOT);
-		strcpy(d->ext, FAT_EXT_PAD);
+	   	str_cpy(d->name, 8, FAT_NAME_DOT);
+		str_cpy(d->ext, 3, FAT_EXT_PAD);
 		d->attr = FAT_ATTR_SUBDIR;
 		d->firstc = host2uint16_t_le(childp->firstc);
@@ -500,6 +500,6 @@
 	    str_cmp(d->name, FAT_NAME_DOT_DOT) == 0) {
 		memset(d, 0, sizeof(fat_dentry_t));
-		strcpy(d->name, FAT_NAME_DOT_DOT);
-		strcpy(d->ext, FAT_EXT_PAD);
+		str_cpy(d->name, 8, FAT_NAME_DOT_DOT);
+		str_cpy(d->ext, 3, FAT_EXT_PAD);
 		d->attr = FAT_ATTR_SUBDIR;
 		d->firstc = (parentp->firstc == FAT_CLST_ROOT) ?
Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 3cc6a5200ed5c174df3efad1870dab86c9c73d13)
@@ -326,5 +326,5 @@
 		return ENOMEM;
 	}
-	strcpy(namep->name, nm);
+	str_cpy(namep->name, size + 1, nm);
 	namep->parent = parentp;
 	
