[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/9] linux-user: do_setsockopt: make ip_mreq local to the place it
From: |
Richard Henderson |
Subject: |
[PULL 3/9] linux-user: do_setsockopt: make ip_mreq local to the place it is used and inline target_to_host_ip_mreq() |
Date: |
Wed, 24 Apr 2024 15:51:17 -0700 |
From: Michael Tokarev <mjt@tls.msk.ru>
ip_mreq is declared at the beginning of do_setsockopt(), while
it is used in only one place. Move its declaration to that very
place and replace pointer to alloca()-allocated memory with the
structure itself.
target_to_host_ip_mreq() is used only once, inline it.
This change also properly handles TARGET_EFAULT when the address
is wrong.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20240331100737.2724186-3-mjt@tls.msk.ru>
[rth: Fix braces, adjust optlen to match host structure size]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/syscall.c | 47 ++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 59fb3e911f..cca9cafe4f 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1615,24 +1615,6 @@ static abi_long do_pipe(CPUArchState *cpu_env, abi_ulong
pipedes,
return get_errno(ret);
}
-static inline abi_long target_to_host_ip_mreq(struct ip_mreqn *mreqn,
- abi_ulong target_addr,
- socklen_t len)
-{
- struct target_ip_mreqn *target_smreqn;
-
- target_smreqn = lock_user(VERIFY_READ, target_addr, len, 1);
- if (!target_smreqn)
- return -TARGET_EFAULT;
- mreqn->imr_multiaddr.s_addr = target_smreqn->imr_multiaddr.s_addr;
- mreqn->imr_address.s_addr = target_smreqn->imr_address.s_addr;
- if (len == sizeof(struct target_ip_mreqn))
- mreqn->imr_ifindex = tswapal(target_smreqn->imr_ifindex);
- unlock_user(target_smreqn, target_addr, 0);
-
- return 0;
-}
-
static inline abi_long target_to_host_sockaddr(int fd, struct sockaddr *addr,
abi_ulong target_addr,
socklen_t len)
@@ -2067,7 +2049,6 @@ static abi_long do_setsockopt(int sockfd, int level, int
optname,
{
abi_long ret;
int val;
- struct ip_mreqn *ip_mreq;
struct ip_mreq_source *ip_mreq_source;
switch(level) {
@@ -2111,15 +2092,33 @@ static abi_long do_setsockopt(int sockfd, int level,
int optname,
break;
case IP_ADD_MEMBERSHIP:
case IP_DROP_MEMBERSHIP:
+ {
+ struct ip_mreqn ip_mreq;
+ struct target_ip_mreqn *target_smreqn;
+
+ QEMU_BUILD_BUG_ON(sizeof(struct ip_mreq) !=
+ sizeof(struct target_ip_mreq));
+
if (optlen < sizeof (struct target_ip_mreq) ||
- optlen > sizeof (struct target_ip_mreqn))
+ optlen > sizeof (struct target_ip_mreqn)) {
return -TARGET_EINVAL;
+ }
- ip_mreq = (struct ip_mreqn *) alloca(optlen);
- target_to_host_ip_mreq(ip_mreq, optval_addr, optlen);
- ret = get_errno(setsockopt(sockfd, level, optname, ip_mreq,
optlen));
+ target_smreqn = lock_user(VERIFY_READ, optval_addr, optlen, 1);
+ if (!target_smreqn) {
+ 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_mreqn)) {
+ ip_mreq.imr_ifindex = tswapal(target_smreqn->imr_ifindex);
+ optlen = sizeof(struct ip_mreqn);
+ }
+ unlock_user(target_smreqn, optval_addr, 0);
+
+ ret = get_errno(setsockopt(sockfd, level, optname, &ip_mreq,
optlen));
break;
-
+ }
case IP_BLOCK_SOURCE:
case IP_UNBLOCK_SOURCE:
case IP_ADD_SOURCE_MEMBERSHIP:
--
2.34.1
- [PULL 0/9] tcg + linux-user patch queue, Richard Henderson, 2024/04/24
- [PULL 1/9] meson: Make DEBUG_REMAP a meson option, Richard Henderson, 2024/04/24
- [PULL 2/9] linux-user: do_setsockopt: fix SOL_ALG.ALG_SET_KEY, Richard Henderson, 2024/04/24
- [PULL 3/9] linux-user: do_setsockopt: make ip_mreq local to the place it is used and inline target_to_host_ip_mreq(),
Richard Henderson <=
- [PULL 4/9] linux-user: do_setsockopt: make ip_mreq_source local to the place where it is used, Richard Henderson, 2024/04/24
- [PULL 5/9] linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO, Richard Henderson, 2024/04/24
- [PULL 6/9] linux-user: Add FITRIM ioctl, Richard Henderson, 2024/04/24
- [PULL 7/9] target/m68k: Pass semihosting arg to exit, Richard Henderson, 2024/04/24
- [PULL 9/9] target/m68k: Support semihosting on non-ColdFire targets, Richard Henderson, 2024/04/24
- [PULL 8/9] target/m68k: Perform the semihosting test during translate, Richard Henderson, 2024/04/24
- Re: [PULL 0/9] tcg + linux-user patch queue, Richard Henderson, 2024/04/24