Skip to content

Fix potential vulnerable cloned function #191

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
npt-1707 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix potential vulnerable cloned function #191

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions src/little/linux/fs/btrfs/ioctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4247,7 +4247,9 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)
}

/* update qgroup status and info */
mutex_lock(&fs_info->qgroup_ioctl_lock);
err = btrfs_run_qgroups(trans);
mutex_unlock(&fs_info->qgroup_ioctl_lock);
if (err < 0)
btrfs_handle_fs_error(fs_info, err,
"failed to update qgroup status and info");
Expand Down
11 changes: 10 additions & 1 deletion src/little/linux/fs/btrfs/qgroup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2699,13 +2699,22 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)
}

/*
* called from commit_transaction. Writes all changed qgroups to disk.
* Writes all changed qgroups to disk.
* Called by the transaction commit path and the qgroup assign ioctl.
*/
int btrfs_run_qgroups(struct btrfs_trans_handle *trans)
{
struct btrfs_fs_info *fs_info = trans->fs_info;
int ret = 0;

/*
* In case we are called from the qgroup assign ioctl, assert that we
* are holding the qgroup_ioctl_lock, otherwise we can race with a quota
* disable operation (ioctl) and access a freed quota root.
*/
if (trans->transaction->state != TRANS_STATE_COMMIT_DOING)
lockdep_assert_held(&fs_info->qgroup_ioctl_lock);

if (!fs_info->quota_root)
return ret;

Expand Down