Skip to content

meta: forbid empty name for dentry #1687

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

Merged
merged 2 commits into from
Apr 1, 2022
Merged

meta: forbid empty name for dentry #1687

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
ef8476b
meta: forbid empty name for dentry
SandyXSD Mar 30, 2022
9e5d180
meta: readdir skips entry with empty name
SandyXSD Mar 30, 2022
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
9 changes: 9 additions & 0 deletions pkg/meta/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,9 @@ func (m *baseMeta) Mknod(ctx Context, parent Ino, name string, _type uint8, mode
if m.conf.ReadOnly {
return syscall.EROFS
}
if name == "" {
return syscall.ENOENT
}

defer timeit(time.Now())
if m.checkQuota(4<<10, 1) {
Expand Down Expand Up @@ -631,6 +634,9 @@ func (m *baseMeta) Link(ctx Context, inode, parent Ino, name string, attr *Attr)
if m.conf.ReadOnly {
return syscall.EROFS
}
if name == "" {
return syscall.ENOENT
}

defer timeit(time.Now())
parent = m.checkRoot(parent)
Expand Down Expand Up @@ -696,6 +702,9 @@ func (m *baseMeta) Rename(ctx Context, parentSrc Ino, nameSrc string, parentDst
if m.conf.ReadOnly {
return syscall.EROFS
}
if nameDst == "" {
return syscall.ENOENT
}
switch flags {
case 0, RenameNoReplace, RenameExchange:
case RenameWhiteout, RenameNoReplace | RenameWhiteout:
Expand Down
8 changes: 6 additions & 2 deletions pkg/meta/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1577,9 +1577,13 @@ func (r *redisMeta) doReaddir(ctx Context, inode Ino, plus uint8, entries *[]*En
newEntries := make([]Entry, len(keys)/2)
newAttrs := make([]Attr, len(keys)/2)
for i := 0; i < len(keys); i += 2 {
typ, inode := r.parseEntry([]byte(keys[i+1]))
typ, ino := r.parseEntry([]byte(keys[i+1]))
if keys[i] == "" {
logger.Errorf("Corrupt entry with empty name: inode %d parent %d", ino, inode)
continue
}
ent := &newEntries[i/2]
ent.Inode = inode
ent.Inode = ino
ent.Name = []byte(keys[i])
ent.Attr = &newAttrs[i/2]
ent.Attr.Typ = typ
Expand Down
4 changes: 4 additions & 0 deletions pkg/meta/sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,6 +1589,10 @@ func (m *dbMeta) doReaddir(ctx Context, inode Ino, plus uint8, entries *[]*Entry
return errno(err)
}
for _, n := range nodes {
if n.Name == "" {
logger.Errorf("Corrupt entry with empty name: inode %d parent %d", n.Inode, inode)
continue
}
entry := &Entry{
Inode: n.Inode,
Name: []byte(n.Name),
Expand Down
8 changes: 6 additions & 2 deletions pkg/meta/tkv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,9 +1426,13 @@ func (m *kvMeta) doReaddir(ctx Context, inode Ino, plus uint8, entries *[]*Entry
}
prefix := len(m.entryKey(inode, ""))
for name, buf := range vals {
typ, inode := m.parseEntry(buf)
typ, ino := m.parseEntry(buf)
if len(name) == prefix {
logger.Errorf("Corrupt entry with empty name: inode %d parent %d", ino, inode)
continue
}
*entries = append(*entries, &Entry{
Inode: inode,
Inode: ino,
Name: []byte(name)[prefix:],
Attr: &Attr{Typ: typ},
})
Expand Down