🆕 新增fat文件名合法性检查

This commit is contained in:
fslongjin 2022-07-06 18:20:38 +08:00
parent b79ba099df
commit 440b3c917f
3 changed files with 81 additions and 7 deletions

View File

@ -889,7 +889,9 @@ int64_t fat32_mkdir(struct vfs_index_node_t *parent_inode, struct vfs_dir_entry_
// 父目录项的inode
struct fat32_inode_info_t *parent_inode_info = (struct fat32_inode_info_t *)parent_inode->private_inode_info;
// ======== todo:检验名称的合法性
retval = fat32_check_name_available(dEntry->name, dEntry->name_length, 0);
if (retval != 0)
return retval;
// ====== 找一块连续的区域放置新的目录项 =====
// 计算总共需要多少个目录项
@ -952,7 +954,10 @@ int64_t fat32_mkdir(struct vfs_index_node_t *parent_inode, struct vfs_dir_entry_
{
if (dEntry->name[tmp_index] == '.')
break;
empty_fat32_dentry->DIR_Name[tmp_index] = dEntry->name[tmp_index];
if (fat32_check_char_available_in_short_name(dEntry->name[tmp_index], tmp_index))
empty_fat32_dentry->DIR_Name[tmp_index] = dEntry->name[tmp_index];
else
empty_fat32_dentry->DIR_Name[tmp_index] = 0x20;
}
// 不满的部分使用0x20填充

View File

@ -3,6 +3,7 @@
#include <common/errno.h>
#include <mm/slab.h>
static const char unavailable_character_in_short_name[] = {0x22, 0x2a, 0x2b, 0x2c, 0x2e, 0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x5b, 0x5c, 0x5d, 0x7c};
/**
* @brief
*
@ -93,7 +94,7 @@ done:;
}
else // 出现错误
{
kwarn("err in alloc clusters");
kwarn("err in alloc clusters");
if (clus_idx < num_clusters)
fat32_free_clusters(inode, clusters[0]);
return retval;
@ -168,7 +169,6 @@ uint32_t fat32_write_FAT_entry(fat32_sb_info_t *fsbi, uint32_t cluster, uint32_t
return 0;
}
/**
* @brief inode的目录项簇中num个空的目录项
*
@ -254,4 +254,52 @@ struct fat32_Directory_t *fat32_find_empty_dentry(struct vfs_index_node_t *paren
kfree(tmp_buf);
}
}
}
/**
* @brief
*
* @param name
* @param namelen
* @param reserved
* @return int 0
*/
int fat32_check_name_available(const char *name, int namelen, int8_t reserved)
{
if (namelen > 255 || namelen <= 0)
return -ENAMETOOLONG;
// 首个字符不能是空格或者'.'
if (name[0] == 0x20 || name[0] == '.')
return -EINVAL;
return 0;
}
/**
* @brief
*
* @param c
* @param index
* @return true
* @return false
*/
bool fat32_check_char_available_in_short_name(const char c, int index)
{
// todo: 严格按照fat规范完善合法性检查功能
if (index == 0)
{
if (c < 0x20)
{
if (c != 0x05)
return false;
return true;
}
}
for (int i = 0; i < sizeof(unavailable_character_in_short_name) / sizeof(char); ++i)
{
if (c == unavailable_character_in_short_name[i])
return false;
}
return true;
}

View File

@ -2,10 +2,11 @@
#include "fat32.h"
#include <filesystem/VFS/VFS.h>
#include <stdbool.h>
/**
* @brief
*
*
* @param inode inode
* @param clusters
* @param num_clusters
@ -15,12 +16,12 @@ int fat32_alloc_clusters(struct vfs_index_node_t *inode, uint32_t *clusters, int
/**
* @brief inode的cluster开始的所有簇
*
*
* @param inode inode
* @param cluster
* @return int
*/
int fat32_free_clusters(struct vfs_index_node_t * inode, int32_t cluster);
int fat32_free_clusters(struct vfs_index_node_t *inode, int32_t cluster);
/**
* @brief FAT表项
@ -53,3 +54,23 @@ uint32_t fat32_write_FAT_entry(fat32_sb_info_t *fsbi, uint32_t cluster, uint32_t
* @return struct fat32_Directory_t* entry的指针num个
*/
struct fat32_Directory_t *fat32_find_empty_dentry(struct vfs_index_node_t *parent_inode, uint32_t num, uint32_t mode, uint32_t *res_sector, uint64_t *res_cluster, uint64_t *res_data_buf_base);
/**
* @brief
*
* @param name
* @param namelen
* @param reserved
* @return int 0
*/
int fat32_check_name_available(const char *name, int namelen, int8_t reserved);
/**
* @brief
*
* @param c
* @param index
* @return true
* @return false
*/
bool fat32_check_char_available_in_short_name(const char c, int index);