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

!9036 IB/hfi1: Restore allocated resources on failed copyout 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MUTSXTCHA2UCYX2H4XYLVSPIH43GTGHS/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9R4LR 
 
Link:https://gitee.com/openeuler/kernel/pulls/9036

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 38e5ed39 df36ec36

drivers/infiniband/hw/hfi1/file_ops.c

+5 −2
Original line number Diff line number Diff line
@@ -1345,12 +1345,15 @@ static int user_exp_rcv_setup(struct hfi1_filedata *fd, unsigned long arg, 
		addr = arg + offsetof(struct hfi1_tid_info, tidcnt);

		if (copy_to_user((void __user *)addr, &tinfo.tidcnt,

				 sizeof(tinfo.tidcnt)))

			return -EFAULT;

			ret = -EFAULT;



		addr = arg + offsetof(struct hfi1_tid_info, length);

		if (copy_to_user((void __user *)addr, &tinfo.length,

		if (!ret && copy_to_user((void __user *)addr, &tinfo.length,

				 sizeof(tinfo.length)))

			ret = -EFAULT;



		if (ret)

			hfi1_user_exp_rcv_invalid(fd, &tinfo);

	}



	return ret;