From patchwork Mon Apr 8 17:48:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 786955 Delivered-To: patch@linaro.org Received: by 2002:adf:fb4d:0:b0:346:15ad:a2a with SMTP id c13csp2605wrs; Mon, 8 Apr 2024 10:58:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQtoxGikmJPBiFwUVq4B1lXYHEXh0lrxCwucG7JwHFAMwgColfWeybgWWSYYqkn6y1zX94HviyiZflv75T08QP X-Google-Smtp-Source: AGHT+IF5DqZKwT41zEW72lSAdf6hCMIF0o1H3afF+5e3B9BBz0jQbR1+ekXIO6w+FdMiy3tTfxoJ X-Received: by 2002:a05:620a:a06:b0:78a:5eb3:8e3d with SMTP id i6-20020a05620a0a0600b0078a5eb38e3dmr10159659qka.8.1712599088991; Mon, 08 Apr 2024 10:58:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712599088; cv=none; d=google.com; s=arc-20160816; b=JmK+kxsul2O7nJLAMuFjZw3QAnNuSpRtGI8JuAfjFg5jOlx9QRrtxFDvl0agWqLRFF QfXq518iGLcBZIV/4tYrqC4rSYBeqNHpT2izE2O0FuqdDMgjf/08+xY+HlOsXpSLK+Uq jdjLKZ2ws0maCKrsW0+69wCETHKx4TmUZC67lJCAreKB6P70qDTEZTHTRupc68cVf2sr qal6jA+XN4BOMQfT0cgC36xdAAqa4HHvRH6tNNSnQ2NCkNKPUrmYh807LmRa72N6r9Lh n/UqRDnR4rywQEvs2igg0oA9cO28BhZ2r4XAXpbvSzo+W4xUPZ4N12wrQsOFJ7wpoX14 x33w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JI74xSWz9fuppvIeUIbROGR0F/ne9t6G9LvnZBioEes=; fh=TF63Ze67lDnVlkd8xmxXNff2WGh+3exboZvnQbD94Yg=; b=E0UdAcxk8luH3NNDEL2PqvFg+jXGV8MtHEnczi/TtZ87o/cP8mAlHioTRVR4aDWLz6 aitJvjg0zKYCOFC368184z14I35rBGwRPqTJBSB1o3EoGO5nuGluvCwlrVLa+Kgai/TM 48l4zONyz1ftXDlj8zu1+dYIUTuvB6wIWRzWbii41kQzONbC7lcVi0Lq7NMvaKI2V8Tp K8hBwwwViTjWmBfehMRr6fIjUA6tVBda/34LN+Pw+1idtEkiTPi1MC+7KUKJ6oz9NUhU qrBSh1LmTcwB1cdA9cKvv8syE4Gx4uta87z2n7OUENaNXEWn6hype2s8Zdgn6TjKaf1C 3m2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gMe41AQw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bk29-20020a05620a1a1d00b0078d618d46a5si4619735qkb.549.2024.04.08.10.58.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Apr 2024 10:58:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gMe41AQw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtt7y-000205-Be; Mon, 08 Apr 2024 13:49:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtt7m-0001v9-Rx for qemu-devel@nongnu.org; Mon, 08 Apr 2024 13:49:47 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rtt7k-0003cK-Iq for qemu-devel@nongnu.org; Mon, 08 Apr 2024 13:49:42 -0400 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-29f93c4946cso2932168a91.1 for ; Mon, 08 Apr 2024 10:49:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712598579; x=1713203379; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JI74xSWz9fuppvIeUIbROGR0F/ne9t6G9LvnZBioEes=; b=gMe41AQwr23QosU50ARtALzjdIgT5uWpbqm7HqR7Sdilb/Qrp7vJraozul9j/7iqXV Av66F9MbqyCT+9c5UhJJBvHtGzmDw9KHM9fjUOSnp+bKL+WknMEVYLwKmYQR6/HmAu9T 4LOB2yUVgh4A1Ts04bRgYxOMD7QJ4QzAhrub83u0APfXxZC6E9dIwYwbGHrUxAdRg68O Huk+U1OQVYdSubXajFPHuk9rwzxKbKaST/D44ZAc5YCBKFcy+ha7p6jmVcuVLQDLYcNi kTnwFOa0PZesZi994LB5Hlc+tOoYURLRcWO9gjOFF74Gd46mBTHulKMnGItgd6O7zJMa pHTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712598579; x=1713203379; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JI74xSWz9fuppvIeUIbROGR0F/ne9t6G9LvnZBioEes=; b=qPDygR/TgwErAW43orun3upcabRSlreYkT/2iwkJBw/wFACwBOJAppVO+br2x67QVT E1xFy1L1TbjLVVwXAhgSAgzI0f5Ll2cS6eEBjx33SmV/P6G8Tdtqvg0JjKO4F2kZOJLV BhqC0qBPH+MMah61PPHaf1p2XqlL1UTxE0DFBUAFYXxiXaTpE8sgZmoHDpDvxC/BxI7i fNYDh+7lgiphQTjcPi4ywOY97YcbXkH7G/DRXIo/RfBNkIqcy86mChAnGndpeMLNEeND 5+mEcFzM1rOPbLqiz2kGPYJ6I+MkKKqrE9jNfQfgtBnEgITLidtz91iwUuygBBFQLSEH fupQ== X-Gm-Message-State: AOJu0YwOgdRYioumX2W/OOqyKJt+ecw+e0Le1czsFxgIZKqpthXcOM6V UQ3pJnZwXM6edkjco1iNeJ7AMoR9vid75TZjF8B0blIiMX9xJW1XJZlq7KCJi5t9AXf1cCfB0a8 c X-Received: by 2002:a17:90a:d483:b0:2a2:94c0:38d4 with SMTP id s3-20020a17090ad48300b002a294c038d4mr7552188pju.31.1712598579264; Mon, 08 Apr 2024 10:49:39 -0700 (PDT) Received: from stoup.. (098-147-007-212.res.spectrum.com. [98.147.7.212]) by smtp.gmail.com with ESMTPSA id ga15-20020a17090b038f00b0029c3bac0aa8sm8658432pjb.4.2024.04.08.10.49.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 10:49:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Michael Tokarev 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 Message-Id: <20240408174929.862917-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240408174929.862917-1-richard.henderson@linaro.org> References: <20240408174929.862917-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Michael Tokarev Signed-off-by: Michael Tokarev Message-Id: <20240331100737.2724186-4-mjt@tls.msk.ru> Signed-off-by: Richard Henderson --- 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; }