Skip to content

Commit 4eb1f66

Browse files
tiwaimasoncl
authored andcommitted
Btrfs: Fix memory corruption by ulist_add_merge() on 32bit arch
We've got bug reports that btrfs crashes when quota is enabled on 32bit kernel, typically with the Oops like below: BUG: unable to handle kernel NULL pointer dereference at 00000004 IP: [<f9234590>] find_parent_nodes+0x360/0x1380 [btrfs] *pde = 00000000 Oops: 0000 [#1] SMP CPU: 0 PID: 151 Comm: kworker/u8:2 Tainted: G S W 3.15.2-1.gd43d97e-default #1 Workqueue: btrfs-qgroup-rescan normal_work_helper [btrfs] task: f1478130 ti: f147c000 task.ti: f147c000 EIP: 0060:[<f9234590>] EFLAGS: 00010213 CPU: 0 EIP is at find_parent_nodes+0x360/0x1380 [btrfs] EAX: f147dda8 EBX: f147ddb0 ECX: 00000011 EDX: 00000000 ESI: 00000000 EDI: f147dda4 EBP: f147ddf8 ESP: f147dd38 DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 CR0: 8005003b CR2: 00000004 CR3: 00bf3000 CR4: 00000690 Stack: 00000000 00000000 f147dda4 00000050 00000001 00000000 00000001 00000050 00000001 00000000 d3059000 00000001 00000022 000000a8 00000000 00000000 00000000 000000a1 00000000 00000000 00000001 00000000 00000000 11800000 Call Trace: [<f923564d>] __btrfs_find_all_roots+0x9d/0xf0 [btrfs] [<f9237bb1>] btrfs_qgroup_rescan_worker+0x401/0x760 [btrfs] [<f9206148>] normal_work_helper+0xc8/0x270 [btrfs] [<c025e38b>] process_one_work+0x11b/0x390 [<c025eea1>] worker_thread+0x101/0x340 [<c026432b>] kthread+0x9b/0xb0 [<c0712a71>] ret_from_kernel_thread+0x21/0x30 [<c0264290>] kthread_create_on_node+0x110/0x110 This indicates a NULL corruption in prefs_delayed list. The further investigation and bisection pointed that the call of ulist_add_merge() results in the corruption. ulist_add_merge() takes u64 as aux and writes a 64bit value into old_aux. The callers of this function in backref.c, however, pass a pointer of a pointer to old_aux. That is, the function overwrites 64bit value on 32bit pointer. This caused a NULL in the adjacent variable, in this case, prefs_delayed. Here is a quick attempt to band-aid over this: a new function, ulist_add_merge_ptr() is introduced to pass/store properly a pointer value instead of u64. There are still ugly void ** cast remaining in the callers because void ** cannot be taken implicitly. But, it's safer than explicit cast to u64, anyway. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=887046 Cc: <[email protected]> [v3.11+] Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Chris Mason <[email protected]>
1 parent ce62003 commit 4eb1f66

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

fs/btrfs/backref.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,8 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path,
276276
}
277277
if (ret > 0)
278278
goto next;
279-
ret = ulist_add_merge(parents, eb->start,
280-
(uintptr_t)eie,
281-
(u64 *)&old, GFP_NOFS);
279+
ret = ulist_add_merge_ptr(parents, eb->start,
280+
eie, (void **)&old, GFP_NOFS);
282281
if (ret < 0)
283282
break;
284283
if (!ret && extent_item_pos) {
@@ -1011,9 +1010,9 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans,
10111010
goto out;
10121011
ref->inode_list = eie;
10131012
}
1014-
ret = ulist_add_merge(refs, ref->parent,
1015-
(uintptr_t)ref->inode_list,
1016-
(u64 *)&eie, GFP_NOFS);
1013+
ret = ulist_add_merge_ptr(refs, ref->parent,
1014+
ref->inode_list,
1015+
(void **)&eie, GFP_NOFS);
10171016
if (ret < 0)
10181017
goto out;
10191018
if (!ret && extent_item_pos) {

fs/btrfs/ulist.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,21 @@ void ulist_free(struct ulist *ulist);
5757
int ulist_add(struct ulist *ulist, u64 val, u64 aux, gfp_t gfp_mask);
5858
int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,
5959
u64 *old_aux, gfp_t gfp_mask);
60+
61+
/* just like ulist_add_merge() but take a pointer for the aux data */
62+
static inline int ulist_add_merge_ptr(struct ulist *ulist, u64 val, void *aux,
63+
void **old_aux, gfp_t gfp_mask)
64+
{
65+
#if BITS_PER_LONG == 32
66+
u64 old64 = (uintptr_t)*old_aux;
67+
int ret = ulist_add_merge(ulist, val, (uintptr_t)aux, &old64, gfp_mask);
68+
*old_aux = (void *)((uintptr_t)old64);
69+
return ret;
70+
#else
71+
return ulist_add_merge(ulist, val, (u64)aux, (u64 *)old_aux, gfp_mask);
72+
#endif
73+
}
74+
6075
struct ulist_node *ulist_next(struct ulist *ulist,
6176
struct ulist_iterator *uiter);
6277

0 commit comments

Comments
 (0)