Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7896acce authored by Dean Luick's avatar Dean Luick Committed by Greg Kroah-Hartman
Browse files

IB/hfi1: Restore allocated resources on failed copyout 



[ Upstream commit 6601fc0d15ffc20654e39486f9bef35567106d68 ]

Fix a resource leak if an error occurs.

Fixes: f404ca4c ("IB/hfi1: Refactor hfi_user_exp_rcv_setup() IOCTL")
Signed-off-by: default avatarDean Luick <dean.luick@cornelisnetworks.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
Link: https://lore.kernel.org/r/167354736291.2132367.10894218740150168180.stgit@awfm-02.cornelisnetworks.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ae774f48

drivers/infiniband/hw/hfi1/file_ops.c

+5 −2
Original line number Diff line number Diff line
@@ -1363,12 +1363,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;