From patchwork Wed Feb 12 11:53:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "stipa (Code Review)" X-Patchwork-Id: 4126 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:948d:b0:5e7:b9eb:58e8 with SMTP id g13csp888023mal; Wed, 12 Feb 2025 03:53:48 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV3dd6r8efnyFfwO9hi7a9cPcuuNkLEkL/Z3C6UHrX8Sde20DnhHQZhkCgPIXyoQ1f0v7obUfKQvP8=@openvpn.net X-Google-Smtp-Source: AGHT+IHs6nB5Oc/PpOkM1R+81zBG0nM6NVnFjy4ulT/KWAYc0TNBxhN/sOjNN+eKt/qdGuzFsaes X-Received: by 2002:a05:6820:308a:b0:5fc:7aa6:8ba6 with SMTP id 006d021491bc7-5fca18e0702mr1427632eaf.8.1739361228617; Wed, 12 Feb 2025 03:53:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739361228; cv=none; d=google.com; s=arc-20240605; b=eyE4ZCCkJX7F+AWLnqDqIO7rmDL3NOrey9Wo4ayYo+ilXdy44hv9xaq7LTVITPg3AV scT5v3aNhxrlImCIoAlcCeFbpulxhVFGZAy42MLLFaEtAsTakHdJB7WHr1rhMKqpOt9Y Aqop36i2FK/315SINvGEC9dGGonvlKs8dbAKI1KiqsEsikoC5AUkOIKP3QOioQqKZkNe cns8+lx6dU7pj2PW47USb5EzAQ+0aPfDz73IpWwJOy5REtb8BQrWG/mTlWNcZl4m0dbg NuTl8vOSfmS2RCl6mbhVm5mlRkKKztS+D4B2Oyvns6d7QLj9+kFOMg/V0jyb1jV1jwqv lekA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=dmyYFCvLBOJkvPcoTXvgebyQcgW8+YDggWqdfbWdjW8=; fh=lm0MLPW7DntlrDqRECIiC9JlE1uPxhepE0URYHIf+eE=; b=JlKODpcy4g8kQw2ka3bkZl/xg4OeyO9BvhqJDtEK1ikJd3luClI+CVeq9IE28ozIoN fdyMKh5BPymYDDTKZVEqj3yjlvl+8U5nR0qziarXeen2nbr5rePR1Aa0I3rwJAtrRrOs /4VDw4f6JohAsDiOU9RV6xYYHDqV0YP4nJ2hDNAnMSd1pCbvB1SDH2xucaiEy7IrMXr9 S0Bl4kcUOCqzkO1aqu/cnLDShacHXXnXsK1slz49qmHNMNL8RuxNvbB/suxDhI6AUhNq IEiZnhFITfI0RyYB3pjxhCulrlbWd64tLD0MekxNnrfZVU4Y0kgV3+mOzXsXi+83G4yS yzsg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=gAg5bRgC; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=I0CwVuGJ; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Jfxfnoai; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net; dara=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 006d021491bc7-5fc85660becsi5453886eaf.46.2025.02.12.03.53.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Feb 2025 03:53:48 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=gAg5bRgC; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=I0CwVuGJ; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Jfxfnoai; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net; dara=fail header.i=@openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tiBJJ-0000nJ-2E; Wed, 12 Feb 2025 11:53:45 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tiBJI-0000n8-3P for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 11:53:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=FMTPnzZ3ZYr4Rp+21PsRAe2wf7TJmzOvvKOQLfQnz98=; b=gAg5bRgCnBIY7Peqq/V3qkTyGV z1CVPhVIwwhsIqwDxFRmGvFXWr6s7daZyfjLS6tAIirBY5ONrMJZAeKfAGmHo5jxCbZTiECMfG0wB FmkgEg1kpMRVD/j2IfrCaBGAc3UMVjcX043PdOOFZCW+Q8Ly8vdCaUG+bjXUTGx4P3sA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=FMTPnzZ3ZYr4Rp+21PsRAe2wf7TJmzOvvKOQLfQnz98=; b=I 0CwVuGJIaz9mZ2fnJmqFHTfNrWccku0bUdqFHNR2jiA+EQcvBQpkkuV4hy1KjS6T5RCJZTzZNHhOF o43mPqN0eC9xhwJ68wRf1fniwfDTHQUX3/V4t/LjNIoEgLRGJ/WVNjkVMeK74lJScnFWGz2fBSqRJ YDT/SP9uqM1ISpXQ=; Received: from mail-wm1-f50.google.com ([209.85.128.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1tiBJI-0004LF-3H for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 11:53:44 +0000 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43956fcd608so8365585e9.3 for ; Wed, 12 Feb 2025 03:53:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1739361212; x=1739966012; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=FMTPnzZ3ZYr4Rp+21PsRAe2wf7TJmzOvvKOQLfQnz98=; b=JfxfnoaiTzY9+QpOqtGOGwDSQ5eTSHfBYP4HdbN6mefIB3y5Bzn11uZ2oMBd3plPuU a6Qj7BU2jRGTcpCauwBir7rLYaS8Lp08ZPC6LK1aTAoUY0/2DQMNaOLz6Kq/QN/9Gdvd uURoJqIw2p+mz+HpsOGMrob0UMPwVIyx76zHn9QpBHuBllgOJAP+qSJ6EFG66uPW86nS QLH9/qWJBd1CIa1UwmyM5W5lEoZZSoGX8SsTgdYe5dXZi6keOqauJjPGsqju6JOEOQsN oV35z1o3UHfITLgFVBZy5x/+pZIu+UI40uPAyM77jyIywVSE2y0Cz9Pzn7cLrn5KxFyF RAhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739361212; x=1739966012; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FMTPnzZ3ZYr4Rp+21PsRAe2wf7TJmzOvvKOQLfQnz98=; b=gzaWdOeW8MBQK2xcnFk/9XQqVywf6uuId913QDIQimw+b2hc7qKuFCyVUpynsa5ViN XTctScnVBrZlnDrKkA3vymN8UVjAtgAbovJhUD7ZYNADhrGhuIA3F8jnY0nyJEJGHeGp ooWciB88v4oEQozswLXFSI5wHyGarjKj5MjgQ7LJG9HCrTB36M3d8kNUjowSIu82hgis 8QXMqmWtgRuut8dV2MMzNyVi/AIZqvAAOuYtRIFP6nADG3zfp3iE7L7SoaTL+L2YPIqM sqico5YmJObWgzMw+F0yDimwlWai7ChY4bam0eNR/y7Si8bV8QHp5JvxSLb45xZhJIm/ rDLA== X-Gm-Message-State: AOJu0YybuJIJCGpXom8YUfFrsrgXk4a3LO0gvFAs4PjolWLd0R/ny2ZY xqqLsiVlunKv6I6sfh6KPxl5jjbE5LSsA8GhavxesrvnkNuYgveVwYB2W70gGFNGkiriMhKFeie V X-Gm-Gg: ASbGncuxVse1GzNUpQR8iypEcSOS+3uzWPVaXyb2hCrdlrqpFy3u8AKFOCyphvm189K a2KIHOWNxPl7Cer4TbB0XQF6r9Gp69oloVNTGxB4jmUC+vqaF6bFnPsqFir7Vz2WcREyXmDoaYx bj3XS5DHbxvu+8Bq8ObE9cEQza79m9uEl0XjTbMXks4wt9BGcDGc9I9toUI8RujXmNiUgiyyOLi w0yCc/BAWnl7Hy0vVmxTNLrY7CoIWYp08E0gyH/JZDHKXT2h2jVxKutESlNsdRzdnKdK3RqLH0L yCpW5xSwD6lNCc8uMz1xTYXQJ4457B051mEf68+S6gs2KUQphiPK3UmOxJTYL2yqg4HZWH1IpkN ywkAOCoY= X-Received: by 2002:a05:600c:19c6:b0:439:5506:717f with SMTP id 5b1f17b1804b1-4395816a118mr27080245e9.9.1739361212197; Wed, 12 Feb 2025 03:53:32 -0800 (PST) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d20bsm17668075e9.20.2025.02.12.03.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 03:53:31 -0800 (PST) From: "plaisthos (Code Review)" X-Google-Original-From: "plaisthos (Code Review)" X-Gerrit-PatchSet: 1 Date: Wed, 12 Feb 2025 11:53:31 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: If6a636b2099d948e249cf92ed2ba91d1698ee42f X-Gerrit-Change-Number: 888 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: ee5a8c31e5177d9b1889faf5b57a462b9cafb20e References: Message-ID: <3a6e6ed3a581bffe449839f6954a7a0c0494b23b-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.50 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.128.50 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.128.50 listed in bl.score.senderscore.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.50 listed in wl.mailspike.net] 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1tiBJI-0004LF-3H Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Fix oversight of link socket code change in Android code path X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1823852439721396475?= X-GMAIL-MSGID: =?utf-8?q?1823852439721396475?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/888?usp=email to review the following change. Change subject: Fix oversight of link socket code change in Android code path ...................................................................... Fix oversight of link socket code change in Android code path Commit 94b391d7ef5 changed context->link_socket to context->link_sockets but did not change the Android code path. Change-Id: If6a636b2099d948e249cf92ed2ba91d1698ee42f Signed-off-by: Arne Schwabe --- M src/openvpn/init.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/888/1 diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 4014517..a7f7db4 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -4381,16 +4381,16 @@ int socketfd = -1; struct context *c = (struct context *) arg; - if (!c->c2.link_socket) + if (!c->c2.link_sockets || !c->c2.link_sockets[0]) { return -1; } - if (c->c2.link_socket->sd == SOCKET_UNDEFINED) + if (c->c2.link_sockets[0]->sd == SOCKET_UNDEFINED) { return -1; } - socketfd = c->c2.link_socket->sd; + socketfd = c->c2.link_sockets[0]->sd; if (!c->options.pull || c->c2.tls_multi->use_peer_id || samenetwork) { return socketfd;