From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Riku Voipio <riku.voipio@iki.fi>,
Laurent Vivier <laurent@vivier.eu>,
Jonas Schievink <jonasschievink@gmail.com>
Subject: [Qemu-devel] [PULL 4/4] Zero out the host's `msg_control` buffer
Date: Sun, 15 Jul 2018 21:52:42 +0200 [thread overview]
Message-ID: <20180715195242.6645-5-laurent@vivier.eu> (raw)
In-Reply-To: <20180715195242.6645-1-laurent@vivier.eu>
From: Jonas Schievink <jonasschievink@gmail.com>
If this is not done, qemu would drop any control message after the first
one.
This is because glibc's `CMSG_NXTHDR` macro accesses the uninitialized
cmsghdr's length field in order to find out if the message fits into the
`msg_control` buffer, wrongly assuming that it doesn't because the
length field contains garbage. Accessing the length field is fine for
completed messages we receive from the kernel, but is - as far as I know
- not needed since the kernel won't return such an invalid cmsghdr in
the first place.
This is tracked as this glibc bug:
https://sourceware.org/bugzilla/show_bug.cgi?id=13500
It's probably also a good idea to bail with an error if `CMSG_NXTHDR`
returns NULL but `TARGET_CMSG_NXTHDR` doesn't (ie. we still expect
cmsgs).
Signed-off-by: Jonas Schievink <jonasschievink@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20180711221244.31869-1-jonasschievink@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/syscall.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index aa4f3eb1c8..3df3bdffb2 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3843,6 +3843,8 @@ static abi_long do_sendrecvmsg_locked(int fd, struct target_msghdr *msgp,
}
msg.msg_controllen = 2 * tswapal(msgp->msg_controllen);
msg.msg_control = alloca(msg.msg_controllen);
+ memset(msg.msg_control, 0, msg.msg_controllen);
+
msg.msg_flags = tswap32(msgp->msg_flags);
count = tswapal(msgp->msg_iovlen);
--
2.17.1
next prev parent reply other threads:[~2018-07-15 19:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-15 19:52 [Qemu-devel] [PULL 0/4] Linux user for 3.0 patches Laurent Vivier
2018-07-15 19:52 ` [Qemu-devel] [PULL 1/4] linux-user: ppc64: use the correct values for F_*LK64s Laurent Vivier
2018-07-15 19:52 ` [Qemu-devel] [PULL 2/4] linux-user: convert remaining fcntl() to safe_fcntl() Laurent Vivier
2018-07-15 19:52 ` [Qemu-devel] [PULL 3/4] linux-user: fix mmap_find_vma_reserved() Laurent Vivier
2018-07-15 19:52 ` Laurent Vivier [this message]
2018-07-16 10:04 ` [Qemu-devel] [PULL 0/4] Linux user for 3.0 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180715195242.6645-5-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=jonasschievink@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).