Skip to content

Fix locking and a double free in fsops rename and unlink #615

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
matejk wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix locking and a double free in fsops rename and unlink #615

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f11bffc
fix: releases of unheld meta_lock in rename and unlink error paths
matejk Aug 17, 2026
41c3264
fix: double free of the new name on a late rename failure
matejk Aug 17, 2026
b2a70e4
fix: check for a non-empty directory before taking parent->meta_lock …
matejk Aug 19, 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
58 changes: 33 additions & 25 deletions src/libltfs/ltfs_fsops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,26 @@ int ltfs_fsops_unlink(const char *path, ltfs_file_id *id, struct ltfs_volume *vo
}
parent = d->parent;

/* Can't remove non-empty directories */
if (d->isdir) {
ret = 0;
acquireread_mrsw(&d->contents_lock);
if (HASH_COUNT(d->child_list) != 0)
ret = -LTFS_DIRNOTEMPTY;
releaseread_mrsw(&d->contents_lock);
if (ret < 0) {
releasewrite_mrsw(&parent->contents_lock);
fs_release_dentry(parent);
releaseread_mrsw(&vol->lock);
free(path_norm);
fs_release_dentry(d);
return ret;
}
}

/* Lock order: parent contents_lock, parent meta_lock, then child meta_lock */
acquirewrite_mrsw(&parent->meta_lock);

Comment thread
XV02 marked this conversation as resolved.
if (parent->is_immutable || parent->is_appendonly) {
ltfsmsg(LTFS_ERR, 17237E, "unlink: parent is WORM");
ret = -LTFS_WORM_ENABLED;
Expand All @@ -471,18 +491,6 @@ int ltfs_fsops_unlink(const char *path, ltfs_file_id *id, struct ltfs_volume *vo
goto out;
}

/* Can't remove non-empty directories */
if (d->isdir) {
ret = 0;
acquireread_mrsw(&d->contents_lock);
if (HASH_COUNT(d->child_list) != 0)
ret = -LTFS_DIRNOTEMPTY;
releaseread_mrsw(&d->contents_lock);
if (ret < 0)
goto out;
}

acquirewrite_mrsw(&parent->meta_lock);
acquirewrite_mrsw(&d->meta_lock);

if (dcache_initialized(vol)) {
Expand Down Expand Up @@ -640,19 +648,6 @@ int ltfs_fsops_rename(const char *from, const char *to, ltfs_file_id *id, struct
goto out_release;
}

if (fromdir->is_appendonly || fromdir->is_immutable ) {
ltfsmsg(LTFS_ERR, 17237E, "rename: parent is WORM");
ret = -LTFS_WORM_ENABLED;
acquirewrite_mrsw(&fromdir->meta_lock);
goto out_release;
}
if (todir->is_immutable || todir->is_appendonly) {
ltfsmsg(LTFS_ERR, 17237E, "rename: target dir is WORM");
ret = -LTFS_WORM_ENABLED;
acquirewrite_mrsw(&fromdir->meta_lock);
goto out_release;
}

/* Take locks in the appropriate order and look up the source and destination dentries */
if (todir == fromdir || fs_is_predecessor(todir, fromdir)) {
acquirewrite_mrsw(&todir->contents_lock);
Expand Down Expand Up @@ -760,6 +755,16 @@ int ltfs_fsops_rename(const char *from, const char *to, ltfs_file_id *id, struct
}
#endif

if (fromdir->is_immutable || fromdir->is_appendonly ||
todir->is_immutable || todir->is_appendonly) {
ltfsmsg(LTFS_ERR, 17237E, "rename: source or target dir is WORM");
ret = -LTFS_WORM_ENABLED;
fs_release_dentry(fromdentry);
if (todentry && todentry != fromdentry)
fs_release_dentry(todentry);
goto out_unlock;
}

if (fromdentry->is_immutable || fromdentry->is_appendonly) {
ltfsmsg(LTFS_ERR, 17237E, "rename: src entry is WORM");
ret = -LTFS_WORM_ENABLED;
Expand Down Expand Up @@ -857,6 +862,9 @@ int ltfs_fsops_rename(const char *from, const char *to, ltfs_file_id *id, struct
fromdentry->name.percent_encode = fs_is_percent_encode_required(fromdentry->name.name);
fromdentry->platform_safe_name = to_filename_copy2;
fromdentry->matches_name_criteria = index_criteria_match(fromdentry, vol);
/* fromdentry owns the buffers now; keep out_free from freeing them again */
to_filename_copy = NULL;
to_filename_copy2 = NULL;

/* Add fromdentry to new directory */
todir->child_list = fs_add_key_to_hash_table(todir->child_list, fromdentry, &ret);
Expand Down
Loading