Commit df447a3b authored by Tiwei Bie's avatar Tiwei Bie Committed by Johannes Berg
Browse files

um: Fix FD copy size in os_rcv_fd_msg() 



When copying FDs, the copy size should not include the control
message header (cmsghdr). Fix it.

Fixes: 5cde6096 ("um: generalize os_rcv_fd")
Signed-off-by: default avatarTiwei Bie <tiwei.btw@antgroup.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7ebf70cf

arch/um/os-Linux/file.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ ssize_t os_rcv_fd_msg(int fd, int *fds, unsigned int n_fds, 
	    cmsg->cmsg_type != SCM_RIGHTS)

		return n;



	memcpy(fds, CMSG_DATA(cmsg), cmsg->cmsg_len);

	memcpy(fds, CMSG_DATA(cmsg), cmsg->cmsg_len - CMSG_LEN(0));

	return n;

}