projects/linux·commit d4d5d205

uml: fix recvmsg return value checking

d4d5d205 · Jeff Dike <[email protected]> · 2007-11-14 16:58:51 -08:00

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: Jeff Dike <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
d4d5d205b653fe68c898d42e7a27a7363a4fb3ba
Parents
df9d177a

Changes

1 files changed · +1 −2

FileStatusAddDelContent
arch/um/os-Linux/file.cmodified+1−2View file

arch/um/os-Linux/file.c

View file
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index b542a3a..f834627 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -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);