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

Commit d4d5d205 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: fix recvmsg return value checking 



Stupid bug - we need to compare the return value of recvmsg to the value of
iov_len, not its size.  This caused port_helper processes not to be killed on
shutdown on x86_64 because the pids weren't being passed out properly.

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent df9d177a

arch/um/os-Linux/file.c

+1 −2
Original line number Diff line number Diff line
@@ -496,8 +496,7 @@ int os_rcv_fd(int fd, int *helper_pid_out) 
	n = recvmsg(fd, &msg, 0);

	if(n < 0)

		return -errno;



	else if(n != sizeof(iov.iov_len))

	else if(n != iov.iov_len)

		*helper_pid_out = -1;



	cmsg = CMSG_FIRSTHDR(&msg);