summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQu Wenruo <quwenruo@cn.fujitsu.com>2016-01-22 09:28:38 +0800
committerChris Mason <clm@fb.com>2016-01-25 16:50:26 -0800
commit0a95b851370b84a4b9d92ee6d1fa0926901d0454 (patch)
tree961bebab8ad070e86c3e5600e3617d28104a16b5
parentde0ee0edb21fbab4c7afa3e94573ecfebfb0244e (diff)
downloadlinux-stable-0a95b851370b84a4b9d92ee6d1fa0926901d0454.tar.gz
linux-stable-0a95b851370b84a4b9d92ee6d1fa0926901d0454.tar.bz2
linux-stable-0a95b851370b84a4b9d92ee6d1fa0926901d0454.zip
btrfs: async-thread: Fix a use-after-free error for trace
Parameter of trace_btrfs_work_queued() can be freed in its workqueue. So no one use use that pointer after queue_work(). Fix the user-after-free bug by move the trace line before queue_work(). Reported-by: Dave Jones <davej@codemonkey.org.uk> Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: Chris Mason <clm@fb.com>
-rw-r--r--fs/btrfs/async-thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index 88d9af3d4581..5fb60ea7eee2 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -328,8 +328,8 @@ static inline void __btrfs_queue_work(struct __btrfs_workqueue *wq,
list_add_tail(&work->ordered_list, &wq->ordered_list);
spin_unlock_irqrestore(&wq->list_lock, flags);
}
- queue_work(wq->normal_wq, &work->normal_work);
trace_btrfs_work_queued(work);
+ queue_work(wq->normal_wq, &work->normal_work);
}
void btrfs_queue_work(struct btrfs_workqueue *wq,