Unverified Commit 98dea376 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10436 CVE-2024-39476 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EFWRKAKQM4ZTPZ6FMKCQUBOL7QP6JKZP/ 
Song Liu (1):
  Revert "Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d""

Yu Kuai (1):
  md/raid5: fix deadlock that raid5d() wait for itself to clear
    MD_SB_CHANGE_PENDING


-- 
2.39.2
 
https://gitee.com/src-openeuler/kernel/issues/IAB04V 
 
Link:https://gitee.com/openeuler/kernel/pulls/10436

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 469c8e40 b56cbc0f

drivers/md/raid5.c

+3 −0
Original line number Diff line number Diff line
@@ -6475,6 +6475,9 @@ static void raid5d(struct md_thread *thread) 
		int batch_size, released;

		unsigned int offset;



		if (test_bit(MD_SB_CHANGE_PENDING, &mddev->sb_flags))

			break;



		released = release_stripe_list(conf, conf->temp_inactive_list);

		if (released)

			clear_bit(R5_DID_ALLOC, &conf->cache_state);