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

!15720 nfc: nci: add flush_workqueue to prevent uaf 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/ID4J3FDTWIXME5E6FOYX46ACTVEGYFXD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP1G8 
 
Link:https://gitee.com/openeuler/kernel/pulls/15720

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents af84d479 f3df963d

net/nfc/nci/core.c

+4 −0
Original line number Diff line number Diff line
@@ -560,6 +560,10 @@ static int nci_close_device(struct nci_dev *ndev) 
	mutex_lock(&ndev->req_lock);



	if (!test_and_clear_bit(NCI_UP, &ndev->flags)) {

		/* Need to flush the cmd wq in case

		 * there is a queued/running cmd_work

		 */

		flush_workqueue(ndev->cmd_wq);

		del_timer_sync(&ndev->cmd_timer);

		del_timer_sync(&ndev->data_timer);

		mutex_unlock(&ndev->req_lock);