Skip to content

Commit 6c8ea8b

Browse files
Zhihao Chengjankara
authored andcommitted
quota: Check next/prev free block number after reading from quota file
Following process: Init: v2_read_file_info: <3> dqi_free_blk 0 dqi_free_entry 5 dqi_blks 6 Step 1. chown bin f_a -> dquot_acquire -> v2_write_dquot: qtree_write_dquot do_insert_tree find_free_dqentry get_free_dqblk write_blk(info->dqi_blocks) // info->dqi_blocks = 6, failure. The content in physical block (corresponding to blk 6) is random. Step 2. chown root f_a -> dquot_transfer -> dqput_all -> dqput -> ext4_release_dquot -> v2_release_dquot -> qtree_delete_dquot: dquot_release remove_tree free_dqentry put_free_dqblk(6) info->dqi_free_blk = blk // info->dqi_free_blk = 6 Step 3. drop cache (buffer head for block 6 is released) Step 4. chown bin f_b -> dquot_acquire -> commit_dqblk -> v2_write_dquot: qtree_write_dquot do_insert_tree find_free_dqentry get_free_dqblk dh = (struct qt_disk_dqdbheader *)buf blk = info->dqi_free_blk // 6 ret = read_blk(info, blk, buf) // The content of buf is random info->dqi_free_blk = le32_to_cpu(dh->dqdh_next_free) // random blk Step 5. chown bin f_c -> notify_change -> ext4_setattr -> dquot_transfer: dquot = dqget -> acquire_dquot -> ext4_acquire_dquot -> dquot_acquire -> commit_dqblk -> v2_write_dquot -> dq_insert_tree: do_insert_tree find_free_dqentry get_free_dqblk blk = info->dqi_free_blk // If blk < 0 and blk is not an error code, it will be returned as dquot transfer_to[USRQUOTA] = dquot // A random negative value __dquot_transfer(transfer_to) dquot_add_inodes(transfer_to[cnt]) spin_lock(&dquot->dq_dqb_lock) // page fault , which will lead to kernel page fault: Quota error (device sda): qtree_write_dquot: Error -8000 occurred while creating quota BUG: unable to handle page fault for address: ffffffffffffe120 #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page Oops: 0002 [analogdevicesinc#1] PREEMPT SMP CPU: 0 PID: 5974 Comm: chown Not tainted 6.0.0-rc1-00004 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) RIP: 0010:_raw_spin_lock+0x3a/0x90 Call Trace: dquot_add_inodes+0x28/0x270 __dquot_transfer+0x377/0x840 dquot_transfer+0xde/0x540 ext4_setattr+0x405/0x14d0 notify_change+0x68e/0x9f0 chown_common+0x300/0x430 __x64_sys_fchownat+0x29/0x40 In order to avoid accessing invalid quota memory address, this patch adds block number checking of next/prev free block read from quota file. Fetch a reproducer in [Link]. Link: https://bugzilla.kernel.org/show_bug.cgi?id=216372 Fixes: 1da177e ("Linux-2.6.12-rc2") CC: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Zhihao Cheng <[email protected]> Signed-off-by: Jan Kara <[email protected]>
1 parent e7c7fbb commit 6c8ea8b

File tree

1 file changed

+38
-0
lines changed

1 file changed

+38
-0
lines changed

fs/quota/quota_tree.c

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,35 @@ static ssize_t write_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)
7171
return ret;
7272
}
7373

74+
static inline int do_check_range(struct super_block *sb, const char *val_name,
75+
uint val, uint min_val, uint max_val)
76+
{
77+
if (val < min_val || val > max_val) {
78+
quota_error(sb, "Getting %s %u out of range %u-%u",
79+
val_name, val, min_val, max_val);
80+
return -EUCLEAN;
81+
}
82+
83+
return 0;
84+
}
85+
86+
static int check_dquot_block_header(struct qtree_mem_dqinfo *info,
87+
struct qt_disk_dqdbheader *dh)
88+
{
89+
int err = 0;
90+
91+
err = do_check_range(info->dqi_sb, "dqdh_next_free",
92+
le32_to_cpu(dh->dqdh_next_free), 0,
93+
info->dqi_blocks - 1);
94+
if (err)
95+
return err;
96+
err = do_check_range(info->dqi_sb, "dqdh_prev_free",
97+
le32_to_cpu(dh->dqdh_prev_free), 0,
98+
info->dqi_blocks - 1);
99+
100+
return err;
101+
}
102+
74103
/* Remove empty block from list and return it */
75104
static int get_free_dqblk(struct qtree_mem_dqinfo *info)
76105
{
@@ -85,6 +114,9 @@ static int get_free_dqblk(struct qtree_mem_dqinfo *info)
85114
ret = read_blk(info, blk, buf);
86115
if (ret < 0)
87116
goto out_buf;
117+
ret = check_dquot_block_header(info, dh);
118+
if (ret)
119+
goto out_buf;
88120
info->dqi_free_blk = le32_to_cpu(dh->dqdh_next_free);
89121
}
90122
else {
@@ -232,6 +264,9 @@ static uint find_free_dqentry(struct qtree_mem_dqinfo *info,
232264
*err = read_blk(info, blk, buf);
233265
if (*err < 0)
234266
goto out_buf;
267+
*err = check_dquot_block_header(info, dh);
268+
if (*err)
269+
goto out_buf;
235270
} else {
236271
blk = get_free_dqblk(info);
237272
if ((int)blk < 0) {
@@ -424,6 +459,9 @@ static int free_dqentry(struct qtree_mem_dqinfo *info, struct dquot *dquot,
424459
goto out_buf;
425460
}
426461
dh = (struct qt_disk_dqdbheader *)buf;
462+
ret = check_dquot_block_header(info, dh);
463+
if (ret)
464+
goto out_buf;
427465
le16_add_cpu(&dh->dqdh_entries, -1);
428466
if (!le16_to_cpu(dh->dqdh_entries)) { /* Block got free? */
429467
ret = remove_free_dqentry(info, buf, blk);

0 commit comments

Comments
 (0)