Skip to content

Commit 1ab19c5

Browse files
Hillf DantonAndreas Gruenbacher
authored andcommitted
gfs2: Fix use-after-free in gfs2_glock_shrink_scan
The GLF_LRU flag is checked under lru_lock in gfs2_glock_remove_from_lru() to remove the glock from the lru list in __gfs2_glock_put(). On the shrink scan path, the same flag is cleared under lru_lock but because of cond_resched_lock(&lru_lock) in gfs2_dispose_glock_lru(), progress on the put side can be made without deleting the glock from the lru list. Keep GLF_LRU across the race window opened by cond_resched_lock(&lru_lock) to ensure correct behavior on both sides - clear GLF_LRU after list_del under lru_lock. Reported-by: syzbot <[email protected]> Signed-off-by: Hillf Danton <[email protected]> Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent b7f55d9 commit 1ab19c5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/gfs2/glock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1795,6 +1795,7 @@ __acquires(&lru_lock)
17951795
while(!list_empty(list)) {
17961796
gl = list_first_entry(list, struct gfs2_glock, gl_lru);
17971797
list_del_init(&gl->gl_lru);
1798+
clear_bit(GLF_LRU, &gl->gl_flags);
17981799
if (!spin_trylock(&gl->gl_lockref.lock)) {
17991800
add_back_to_lru:
18001801
list_add(&gl->gl_lru, &lru_list);
@@ -1840,7 +1841,6 @@ static long gfs2_scan_glock_lru(int nr)
18401841
if (!test_bit(GLF_LOCK, &gl->gl_flags)) {
18411842
list_move(&gl->gl_lru, &dispose);
18421843
atomic_dec(&lru_count);
1843-
clear_bit(GLF_LRU, &gl->gl_flags);
18441844
freed++;
18451845
continue;
18461846
}

0 commit comments

Comments
 (0)