Skip to content

[fix][dfs] 修复ramfs与tmpfs对文件名超长的处理逻辑 #11624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Unbear-Hz wants to merge 2 commits into
base: master
Choose a base branch
from
+89 −17
Open

[fix][dfs] 修复ramfs与tmpfs对文件名超长的处理逻辑 #11624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ed4c92
[fix][dfs] 修复ramfs与tmpfs对文件名超长的处理逻辑
Unbear-Hz Jul 15, 2026
7b7ea7b
[fix][dfs]路径过长时设置错误码，补全未声明的变量
Unbear-Hz Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 57 additions & 8 deletions components/dfs/dfs_v2/filesystems/ramfs/dfs_ramfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,51 @@ int dfs_ramfs_ioctl(struct dfs_file *file, int cmd, void *args)
return -EIO;
}

static int _ramfs_set_name(char *name, rt_size_t name_size, const char *path)
{
const char *name_ptr = path;
const char *name_scan;
rt_size_t name_len;

if (path == RT_NULL)
{
return -EINVAL;
}

/* strip leading '/' */
while (*name_ptr == '/' && *name_ptr)
{
name_ptr++;
}

if (*name_ptr == '\0')
{
return -ENOENT;
}

/* reject multi-level paths (ramfs is flat) */
name_scan = name_ptr;
while (*name_scan)
{
if (*name_scan == '/')
{
return -EINVAL;
}
name_scan++;
}

name_len = rt_strlen(name_ptr);
if (name_len >= name_size)
{
return -ENAMETOOLONG;
}

rt_memcpy(name, name_ptr, name_len);
name[name_len] = '\0';

return RT_EOK;
}

struct ramfs_dirent *dfs_ramfs_lookup(struct dfs_ramfs *ramfs,
const char *path,
rt_size_t *size)
Expand Down Expand Up @@ -232,7 +277,7 @@ int dfs_ramfs_open(struct dfs_file *file)
{
if (file->flags & O_CREAT || file->flags & O_WRONLY)
{
char *name_ptr;
int ret;

/* create a file entry */
dirent = (struct ramfs_dirent *)
Expand All @@ -243,13 +288,12 @@ int dfs_ramfs_open(struct dfs_file *file)
return -ENOMEM;
}

/* remove '/' separator */
name_ptr = file->vnode->path;
while (*name_ptr == '/' && *name_ptr)
ret = _ramfs_set_name(dirent->name, sizeof(dirent->name), file->vnode->path);
if (ret != RT_EOK)
{
name_ptr++;
rt_memheap_free(dirent);
return ret;
}
strncpy(dirent->name, name_ptr, RAMFS_NAME_MAX);

rt_list_init(&(dirent->list));
dirent->data = NULL;
Expand Down Expand Up @@ -390,6 +434,7 @@ int dfs_ramfs_rename(struct dfs_filesystem *fs,
struct ramfs_dirent *dirent;
struct dfs_ramfs *ramfs;
rt_size_t size;
int ret;

ramfs = (struct dfs_ramfs *)fs->data;
RT_ASSERT(ramfs != NULL);
Expand All @@ -402,7 +447,11 @@ int dfs_ramfs_rename(struct dfs_filesystem *fs,
if (dirent == NULL)
return -ENOENT;

strncpy(dirent->name, newpath, RAMFS_NAME_MAX);
ret = _ramfs_set_name(dirent->name, sizeof(dirent->name), newpath);
if (ret != RT_EOK)
{
return ret;
}

return RT_EOK;
}
Expand Down Expand Up @@ -471,7 +520,7 @@ struct dfs_ramfs *dfs_ramfs_create(rt_uint8_t *pool, rt_size_t size)
rt_memset(&(ramfs->root), 0x00, sizeof(ramfs->root));
rt_list_init(&(ramfs->root.list));
ramfs->root.size = 0;
strcpy(ramfs->root.name, ".");
rt_strcpy(ramfs->root.name, ".");
ramfs->root.fs = ramfs;

return ramfs;
Expand Down
41 changes: 32 additions & 9 deletions components/dfs/dfs_v2/filesystems/tmpfs/dfs_tmpfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@ static struct dfs_aspace_ops dfs_tmp_aspace_ops =
};
#endif

static int _path_separate(const char *path, char *parent_path, char *file_name)
static int _path_separate(const char *path, char *parent_path, rt_size_t parent_size,
char *file_name, rt_size_t file_size)
{
const char *path_p, *path_q;
rt_size_t parent_len, file_len;

RT_ASSERT(path[0] == '/');

file_name[0] = '\0';
parent_path[0] = '\0';
path_p = path_q = &path[1];
__next_dir:
while (*path_q != '/' && *path_q != '\0')
Expand All @@ -66,10 +69,18 @@ static int _path_separate(const char *path, char *parent_path, char *file_name)
}
else /* Last level dir */
{
rt_memcpy(parent_path, path, path_p - path - 1);
parent_path[path_p - path - 1] = '\0';
rt_memcpy(file_name, path_p, path_q - path_p);
file_name[path_q - path_p] = '\0';
parent_len = path_p - path - 1;
file_len = path_q - path_p;

if ((parent_len + 1 > parent_size) || (file_len + 1 > file_size))
{
return -ENAMETOOLONG;
}

rt_memcpy(parent_path, path, parent_len);
parent_path[parent_len] = '\0';
rt_memcpy(file_name, path_p, file_len);
file_name[file_len] = '\0';
}
}
if (parent_path[0] == 0)
Expand Down Expand Up @@ -612,7 +623,12 @@ static int dfs_tmpfs_rename(struct dfs_dentry *old_dentry, struct dfs_dentry *ne
}

/* find parent file */
_path_separate(new_dentry->pathname, parent_path, file_name);
if (_path_separate(new_dentry->pathname, parent_path, DFS_PATH_MAX,
file_name, sizeof(file_name)) != RT_EOK)
{
rt_free(parent_path);
return -ENAMETOOLONG;
}
if (file_name[0] == '\0') /* it's root dir */
{
rt_free(parent_path);
Expand All @@ -626,7 +642,7 @@ static int dfs_tmpfs_rename(struct dfs_dentry *old_dentry, struct dfs_dentry *ne
dfs_vfs_remove_node(&d_file->node);
rt_spin_unlock(&superblock->lock);

strncpy(d_file->name, file_name, TMPFS_NAME_MAX);
rt_strncpy(d_file->name, file_name, TMPFS_NAME_MAX);

rt_spin_lock(&superblock->lock);
dfs_vfs_append_node(&p_file->node, &d_file->node);
Expand Down Expand Up @@ -707,7 +723,14 @@ static struct dfs_vnode *dfs_tmpfs_create_vnode(struct dfs_dentry *dentry, int t
if (vnode)
{
/* find parent file */
_path_separate(dentry->pathname, parent_path, file_name);
if (_path_separate(dentry->pathname, parent_path, DFS_PATH_MAX,
file_name, sizeof(file_name)) != RT_EOK)
{
rt_set_errno(-ENAMETOOLONG);
rt_free(parent_path);
dfs_vnode_destroy(vnode);
return NULL;
}
Comment thread
Unbear-Hz marked this conversation as resolved.
if (file_name[0] == '\0') /* it's root dir */
{
rt_free(parent_path);
Expand Down Expand Up @@ -735,7 +758,7 @@ static struct dfs_vnode *dfs_tmpfs_create_vnode(struct dfs_dentry *dentry, int t

superblock->df_size += sizeof(struct tmpfs_file);

strncpy(d_file->name, file_name, TMPFS_NAME_MAX);
rt_strncpy(d_file->name, file_name, TMPFS_NAME_MAX);

dfs_vfs_init_node(&d_file->node);
d_file->data = NULL;
Expand Down
Loading