[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/35] linux-user: do_setsockopt: make ip_mreq_source local to the
From: |
Richard Henderson |
Subject: |
[PULL 05/35] linux-user: do_setsockopt: make ip_mreq_source local to the place where it is used |
Date: |
Mon, 8 Apr 2024 07:48:59 -1000 |
From: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20240331100737.2724186-4-mjt@tls.msk.ru>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/syscall.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index cca9cafe4f..1fedf16650 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2049,7 +2049,6 @@ static abi_long do_setsockopt(int sockfd, int level, int
optname,
{
abi_long ret;
int val;
- struct ip_mreq_source *ip_mreq_source;
switch(level) {
case SOL_TCP:
@@ -2123,6 +2122,9 @@ static abi_long do_setsockopt(int sockfd, int level, int
optname,
case IP_UNBLOCK_SOURCE:
case IP_ADD_SOURCE_MEMBERSHIP:
case IP_DROP_SOURCE_MEMBERSHIP:
+ {
+ struct ip_mreq_source *ip_mreq_source;
+
if (optlen != sizeof (struct target_ip_mreq_source))
return -TARGET_EINVAL;
@@ -2133,7 +2135,7 @@ static abi_long do_setsockopt(int sockfd, int level, int
optname,
ret = get_errno(setsockopt(sockfd, level, optname, ip_mreq_source,
optlen));
unlock_user (ip_mreq_source, optval_addr, 0);
break;
-
+ }
default:
goto unimplemented;
}
--
2.34.1
- [PULL 01/35] tcg/optimize: Do not attempt to constant fold neg_vec, (continued)
- [PULL 01/35] tcg/optimize: Do not attempt to constant fold neg_vec, Richard Henderson, 2024/04/08
- [PULL 02/35] linux-user: Fix waitid return of siginfo_t and rusage, Richard Henderson, 2024/04/08
- [PULL 04/35] linux-user: do_setsockopt: make ip_mreq local to the place it is used and inline target_to_host_ip_mreq(), Richard Henderson, 2024/04/08
- [PULL 03/35] linux-user: do_setsockopt: fix SOL_ALG.ALG_SET_KEY, Richard Henderson, 2024/04/08
- [PULL 06/35] linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO, Richard Henderson, 2024/04/08
- [PULL 08/35] linux-user: replace calloc() with g_new0(), Richard Henderson, 2024/04/08
- [PULL 07/35] linux-user: Add FITRIM ioctl, Richard Henderson, 2024/04/08
- [PULL 09/35] target/hppa: Fix IIAOQ, IIASQ for pa2.0, Richard Henderson, 2024/04/08
- [PULL 10/35] target/sh4: mac.w: memory accesses are 16-bit words, Richard Henderson, 2024/04/08
- [PULL 11/35] target/sh4: Merge mach and macl into a union, Richard Henderson, 2024/04/08
- [PULL 05/35] linux-user: do_setsockopt: make ip_mreq_source local to the place where it is used,
Richard Henderson <=
- [PULL 12/35] target/sh4: Fix mac.l with saturation enabled, Richard Henderson, 2024/04/08
- [PULL 14/35] target/sh4: add missing CHECK_NOT_DELAY_SLOT, Richard Henderson, 2024/04/08
- [PULL 13/35] target/sh4: Fix mac.w with saturation enabled, Richard Henderson, 2024/04/08
- [PULL 16/35] target/m68k: Pass semihosting arg to exit, Richard Henderson, 2024/04/08
- [PULL 15/35] target/m68k: Map FPU exceptions to FPSR register, Richard Henderson, 2024/04/08
- [PULL 17/35] target/m68k: Perform the semihosting test during translate, Richard Henderson, 2024/04/08
- [PULL 18/35] target/m68k: Support semihosting on non-ColdFire targets, Richard Henderson, 2024/04/08
- [PULL 19/35] tcg: Add TCGContext.emit_before_op, Richard Henderson, 2024/04/08
- [PULL 20/35] accel/tcg: Add insn_start to DisasContextBase, Richard Henderson, 2024/04/08
- [PULL 21/35] target/arm: Use insn_start from DisasContextBase, Richard Henderson, 2024/04/08