Unverified Commit 7e97eec5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8568 gfs2: Fix use-after-free in gfs2_glock_shrink_scan 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhao Wenhui <zhaowenhui8@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CN4PCF2P742ADNJ35LFVOSK24OENQSII/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4CX 
 
Link:https://gitee.com/openeuler/kernel/pulls/8568

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 85c93ec4 563ba93f

fs/gfs2/glock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1456,6 +1456,7 @@ __acquires(&lru_lock) 
	while(!list_empty(list)) {

	while(!list_empty(list)) {

		gl = list_entry(list->next, struct gfs2_glock, gl_lru);

		gl = list_entry(list->next, struct gfs2_glock, gl_lru);

		list_del_init(&gl->gl_lru);

		list_del_init(&gl->gl_lru);

		clear_bit(GLF_LRU, &gl->gl_flags);

		if (!spin_trylock(&gl->gl_lockref.lock)) {

		if (!spin_trylock(&gl->gl_lockref.lock)) {

add_back_to_lru:

add_back_to_lru:

			list_add(&gl->gl_lru, &lru_list);

			list_add(&gl->gl_lru, &lru_list);
@@ -1501,7 +1502,6 @@ static long gfs2_scan_glock_lru(int nr) 
		if (!test_bit(GLF_LOCK, &gl->gl_flags)) {

		if (!test_bit(GLF_LOCK, &gl->gl_flags)) {

			list_move(&gl->gl_lru, &dispose);

			list_move(&gl->gl_lru, &dispose);

			atomic_dec(&lru_count);

			atomic_dec(&lru_count);

			clear_bit(GLF_LRU, &gl->gl_flags);

			freed++;

			freed++;

			continue;

			continue;

		}

		}