Skip to content

Hold transaction in scoutfs_quota_mod_rule to prevent alloc corruption. #297

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
zabbo merged 1 commit into from
Apr 17, 2026
Merged

Hold transaction in scoutfs_quota_mod_rule to prevent alloc corruption. #297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions kmod/src/quota.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "totl.h"
#include "util.h"
#include "quota.h"
#include "trans.h"
#include "counters.h"
#include "scoutfs_trace.h"

Expand Down Expand Up @@ -1086,6 +1087,10 @@ int scoutfs_quota_mod_rule(struct super_block *sb, bool is_add,
if (ret < 0)
goto out;

ret = scoutfs_hold_trans(sb, true);
if (ret < 0)
goto out;
Comment thread
aversecat marked this conversation as resolved.

down_write(&qtinf->rwsem);

if (is_add) {
Expand All @@ -1095,28 +1100,30 @@ int scoutfs_quota_mod_rule(struct super_block *sb, bool is_add,
else if (ret == 0)
ret = -EEXIST;
if (ret < 0)
goto unlock;
goto release;

rule_to_rule_val(&rv, &rule);
ret = scoutfs_item_create(sb, &key, &rv, sizeof(rv), lock);
if (ret < 0)
goto unlock;
goto release;

} else {
ret = find_rule(sb, &rule, &key, lock) ?:
scoutfs_item_delete(sb, &key, lock);
if (ret < 0)
goto unlock;
goto release;
}

scoutfs_quota_invalidate(sb);
ret = 0;

unlock:
release:
up_write(&qtinf->rwsem);
scoutfs_unlock(sb, lock, SCOUTFS_LOCK_WRITE);
scoutfs_release_trans(sb);

out:
scoutfs_unlock(sb, lock, SCOUTFS_LOCK_WRITE);

if (is_add)
trace_scoutfs_quota_add_rule(sb, &rule, ret);
else
Expand Down