From patchwork Wed Feb 12 12:38:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4129 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:948d:b0:5e7:b9eb:58e8 with SMTP id g13csp913189mal; Wed, 12 Feb 2025 04:38:38 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXO2CHa/0RCdMkIModwi6p6IHgWEi39AzrZsKKxSCUJQf8flKAYLIuA8TZ36lWHEjeZvhY3FN2HyM8=@openvpn.net X-Google-Smtp-Source: AGHT+IGtVVslTC/+/05AeSA/R15IJMOfg0lZ7I2aNm92PVEGG9DqU5swfWeM0EME895zJDcwRw7H X-Received: by 2002:a05:6808:1511:b0:3f3:bc66:924e with SMTP id 5614622812f47-3f3cd93a6b6mr2112713b6e.22.1739363917571; Wed, 12 Feb 2025 04:38:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739363917; cv=none; d=google.com; s=arc-20240605; b=JKAHwD9didsZiBHbLdv//CmUl1I+vh0P/shJvUnQ1p43YcU9WcS93wLAdr9EaKBUTX OCUIqI4k0elQYlh0xy9OJleGRE3VxqjwW70L4fzgdQ5lhQRv1D51AHlbDrJvzL4h11Ah rMDeAWmu2+VFm/D9gKsTlGbuQFTJDvRn9wo7zyL41sDLDykBKF8cBTe3A7HKv4w1FFv0 ZihiL+uTVPY2s6U9txCR9OQIPs+KeaZ+zlyOA5P9tKPZdzQQops9rLp3Gd3+idmzez09 N64t8i/v6TNEMSpC7YLuuJj3s1kLU7YO40CjztfWechz3bgJswK2rtrRqaSnJklj3l9b xjCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=XscvCCLUcwEh0UT0LW5nnFTuNX5Wp+AvcAf40YZvF2s=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=T0OKKnKRG+oCSpI1AiFGxSnlPNthhDLH9RxXVLaMbzD4gTek3XxUjbI7XfjDtXdkcg ZhjJDLcvCZKh/UKsMjHgBAQGWTfAbO+BjBHFVZAQ9wdFDysilMmii2xkFSl8QwZ3G1FL LV6lgopj+3NTZJinAXWZVxElmCAgQ9J9Suf6Y4pikQWVT/6gMcw7+u3yOB3bFYNX3zR3 PPAI6M5u5YsesmFs+k/pVUIJ1G49Ya9eMKizMaKecaH+mXelESofTprXQjb2903g0Vwi FBvIKkvWxDWTY7XKpaZl4YZDKMrPWLOQdLCENLxUCUX+wdh73aQvz30C0OK5GdlxGBmw 7Mmg==; 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=jl3D2AOM; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=dwq7459h; 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=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5614622812f47-3f3cb38730esi2155488b6e.230.2025.02.12.04.38.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Feb 2025 04:38:37 -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=jl3D2AOM; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=dwq7459h; 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=muc.de Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tiC0i-0008BD-F6; Wed, 12 Feb 2025 12:38:35 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tiC0g-0008B7-SI for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 12:38:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bWhdHNoEYsW6HkkuHgi0zaY4pdlPXfaQeHfBKp8wqiM=; b=jl3D2AOMT+Ar1xN1MnjINXHmhU 6WrOiwabMuCInYrYD1C3/k3+CetQ83+4YN3zVcHFwzZeVmAEcZeySMhw9j7prBJufhjdC8mDwdtbI Cu84dvGw/n61yRlM8texzO91mhD6TgTdNCYsUnwMjwoDfmUfuymyD1BMqtEpnYWov1uU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=bWhdHNoEYsW6HkkuHgi0zaY4pdlPXfaQeHfBKp8wqiM=; b=dwq7459hbY046+kCJBksvpe6uf TQkxFNu0PknyMc/fJ5mYkhqyFscRGjKCA0pZH0N++uJL1vpiAy0BiHsPgVeCkn4UvPqmrtbF9+eJ8 HqwwohtjnaiBaiFOHgzx1+pnjygZm98yrdliUs7FPbWWE1KuBgdcHnwR9jD3g8/KjhAU=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1tiC0f-00073n-As for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 12:38:34 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 51CCcL7d019109 for ; Wed, 12 Feb 2025 13:38:21 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 51CCcLC6019108 for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 13:38:21 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 12 Feb 2025 13:38:20 +0100 Message-ID: <20250212123820.19099-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 0.0 (/) 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: From: Arne Schwabe 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 Acked-by: Gert Doering --- Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 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. [193.149.48.174 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. [193.149.48.174 listed in bl.score.senderscore.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Headers-End: 1tiC0f-00073n-As Subject: [Openvpn-devel] [PATCH v1] 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1823855259486212765?= X-GMAIL-MSGID: =?utf-8?q?1823855259486212765?= From: Arne Schwabe 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 Acked-by: Gert Doering --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/888 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering 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;