Skip to content

Commit 5f3fd77

Browse files
Dennis Lamakpm00
authored andcommitted
ocfs2: fix slab-use-after-free due to dangling pointer dqi_priv
When mounting ocfs2 and then remounting it as read-only, a slab-use-after-free occurs after the user uses a syscall to quota_getnextquota. Specifically, sb_dqinfo(sb, type)->dqi_priv is the dangling pointer. During the remounting process, the pointer dqi_priv is freed but is never set as null leaving it to be accessed. Additionally, the read-only option for remounting sets the DQUOT_SUSPENDED flag instead of setting the DQUOT_USAGE_ENABLED flags. Moreover, later in the process of getting the next quota, the function ocfs2_get_next_id is called and only checks the quota usage flags and not the quota suspended flags. To fix this, I set dqi_priv to null when it is freed after remounting with read-only and put a check for DQUOT_SUSPENDED in ocfs2_get_next_id. [[email protected]: coding-style cleanups] Link: https://lkml.kernel.org/r/[email protected] Fixes: 8f9e8f5 ("ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas") Signed-off-by: Dennis Lam <[email protected]> Reported-by: [email protected] Tested-by: [email protected] Closes: https://lore.kernel.org/all/[email protected]/T/ Reviewed-by: Joseph Qi <[email protected]> Cc: Mark Fasheh <[email protected]> Cc: Joel Becker <[email protected]> Cc: Junxiao Bi <[email protected]> Cc: Changwei Ge <[email protected]> Cc: Jun Piao <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 3754137 commit 5f3fd77

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

fs/ocfs2/quota_global.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ static int ocfs2_get_next_id(struct super_block *sb, struct kqid *qid)
893893
int status = 0;
894894

895895
trace_ocfs2_get_next_id(from_kqid(&init_user_ns, *qid), type);
896-
if (!sb_has_quota_loaded(sb, type)) {
896+
if (!sb_has_quota_active(sb, type)) {
897897
status = -ESRCH;
898898
goto out;
899899
}

fs/ocfs2/quota_local.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,7 @@ static int ocfs2_local_free_info(struct super_block *sb, int type)
867867
brelse(oinfo->dqi_libh);
868868
brelse(oinfo->dqi_lqi_bh);
869869
kfree(oinfo);
870+
info->dqi_priv = NULL;
870871
return status;
871872
}
872873

0 commit comments

Comments
 (0)