From: deller@kernel.org
To: Richard Henderson <richard.henderson@linaro.org>,
qemu-devel@nongnu.org, Laurent Vivier <laurent@vivier.eu>,
Peter Maydell <peter.maydell@linaro.org>
Cc: deller@gmx.de
Subject: [PULL 4/6] linux-user: netlink: Add emulation of IP_MULTICAST_IF
Date: Wed, 18 Dec 2024 20:52:45 +0100 [thread overview]
Message-ID: <20241218195247.5459-5-deller@kernel.org> (raw)
In-Reply-To: <20241218195247.5459-1-deller@kernel.org>
From: Helge Deller <deller@gmx.de>
Share code with IP_ADD_MEMBERSHIP/IP_DROP_MEMBERSHIP.
Signed-off-by: Helge Deller <deller@gmx.de>
---
linux-user/syscall.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index bbe2560927..4360543e20 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2130,16 +2130,23 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,
}
ret = get_errno(setsockopt(sockfd, level, optname, &val, sizeof(val)));
break;
+ case IP_MULTICAST_IF:
case IP_ADD_MEMBERSHIP:
case IP_DROP_MEMBERSHIP:
{
struct ip_mreqn ip_mreq;
struct target_ip_mreqn *target_smreqn;
+ int min_size;
QEMU_BUILD_BUG_ON(sizeof(struct ip_mreq) !=
sizeof(struct target_ip_mreq));
- if (optlen < sizeof (struct target_ip_mreq) ||
+ if (optname == IP_MULTICAST_IF) {
+ min_size = sizeof(struct in_addr);
+ } else {
+ min_size = sizeof(struct target_ip_mreq);
+ }
+ if (optlen < min_size ||
optlen > sizeof (struct target_ip_mreqn)) {
return -TARGET_EINVAL;
}
@@ -2149,7 +2156,9 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,
return -TARGET_EFAULT;
}
ip_mreq.imr_multiaddr.s_addr = target_smreqn->imr_multiaddr.s_addr;
- ip_mreq.imr_address.s_addr = target_smreqn->imr_address.s_addr;
+ if (optlen >= sizeof(struct target_ip_mreq)) {
+ ip_mreq.imr_address.s_addr = target_smreqn->imr_address.s_addr;
+ }
if (optlen == sizeof(struct target_ip_mreqn)) {
ip_mreq.imr_ifindex = tswapal(target_smreqn->imr_ifindex);
optlen = sizeof(struct ip_mreqn);
--
2.47.0
next prev parent reply other threads:[~2024-12-18 19:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-18 19:52 [PULL 0/6] Linux user fix gupnp patches deller
2024-12-18 19:52 ` [PULL 1/6] linux-user: netlink: Add missing IFA_PROTO to host_to_target_data_addr_rtattr() deller
2024-12-24 11:57 ` Laurent Vivier
2024-12-18 19:52 ` [PULL 2/6] linux-user: Use unique error messages for cmsg parsing deller
2024-12-19 9:57 ` Philippe Mathieu-Daudé
2024-12-24 11:58 ` Laurent Vivier
2024-12-18 19:52 ` [PULL 3/6] linux-user: netlink: Add IP_PKTINFO " deller
2024-12-18 19:52 ` deller [this message]
2024-12-18 19:52 ` [PULL 5/6] linux-user: netlink: add netlink neighbour emulation deller
2024-12-18 19:52 ` [PULL 6/6] linux-user: netlink: Add missing QEMU_IFLA entries deller
2024-12-19 20:01 ` [PULL 0/6] Linux user fix gupnp patches Stefan Hajnoczi
2024-12-19 21:47 ` Helge Deller
2024-12-31 12:39 ` Stefan Hajnoczi
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=20241218195247.5459-5-deller@kernel.org \
--to=deller@kernel.org \
--cc=deller@gmx.de \
--cc=laurent@vivier.eu \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.