From patchwork Tue Oct 21 19:31:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4523 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:7d42:b0:72f:f16c:e055 with SMTP id fr2csp6866548mab; Tue, 21 Oct 2025 12:32:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/8y0s7xMdpStpuwU2EPagZFzz4DtR5ScnSZo3nWzsFxriMo7JkooqSYw7h5OuA0Da/bsh2ESASyE=@openvpn.net X-Google-Smtp-Source: AGHT+IHjTNp5K4MH2+hMljcQc7TVU+l/HDwSpmq+q4S/zsU1AtxOfxdJtdc3byy/RnJGx+7FMEHT X-Received: by 2002:a05:6830:2b2a:b0:7b0:6c2e:7c13 with SMTP id 46e09a7af769-7c27c9e9344mr9300705a34.16.1761075126051; Tue, 21 Oct 2025 12:32:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1761075126; cv=none; d=google.com; s=arc-20240605; b=CONEETrwS6R+NjldCZoZ4M3CgVZGA66FZSPaNYx7sq4lj5YbYPKxMrk0owX3BMhYJn C1JgvvEQpHbjTnoCL8GVDt3dvBNBP+5x+vOOrFYUe09lQYIMCuetinYLXFrkDWLuuc+y m0rYmhRLVccO6hV+O0DYIoa1eGpA77j5LCuUTV+QCXJtf0ZAqhEAXqOQnv3U2yIzVe6X 6CVc/e5eNXNQC8yAQ0gxaXAjXztVZYS//84a0d1oa4unV4STsGEbtglR4S3zU23V5mLK 3BHRkUKclJLxlil19EQcmkBR4/hRNwl93xv5hvOAt+KBx/juat0KjhC9J1Qvh8+eA0ZF g98g== 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:dkim-signature; bh=9uHJcxD4wSMIEWpxkHc3TfHpdcceCULagSHMCODkHj8=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=XQh2DELda/IZcygFj1REMIhGKMPOA1GJe+RWntnlaGysFeyr8dNxCepY9WYcXE9oez qAoz5kqeTNFRVGDLObcbl0ikq35HkdYdnSRYEAGfq3I+ErHjjhabW6RIxEPxhQqME5UR ++Z8DuWeF2SYYtvcSt7+Tm2TT7VodwTozyJC3bUFfFwMfO4cEdnLPorq/iaCXtoAG1vv lP775DyVT77OsOSDyvBtphgO14BaLin3uiFp+YMfItrnMtkB7RQBYHXcu/OLLjm6Ajj0 D5euj/AaI8GBH9XClbUCHWCYnsqkHBKB/uc4wviGQxmWBlgexIBpQ4n8aeZp3kF3bHYG wiKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=OYuXaD38; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=KiykMeHg; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=RqCINNWL; 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 46e09a7af769-7c2888e27c4si2732078a34.225.2025.10.21.12.32.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Oct 2025 12:32:05 -0700 (PDT) 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=pass header.i=@lists.sourceforge.net header.s=beta header.b=OYuXaD38; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=KiykMeHg; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=RqCINNWL; 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 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9uHJcxD4wSMIEWpxkHc3TfHpdcceCULagSHMCODkHj8=; b=OYuXaD38gexWC0d4VE20BdCp83 fS31TbyM5ZhfQvcdd1eiPyK5hlpUQ1qypOKlYwp6BlUgo4VvG3EQIrAGKDgjXMIMGNB6Wp6XK4IfL FRdJ5VY/9zY/2j715jbV6t/qmeOq47J4lly9KaMmpeop961JvKQ5yZMC8IG2RlvyRodI=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1vBI5T-0008Tr-Il; Tue, 21 Oct 2025 19:32:03 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1vBI5R-0008TZ-Rw for openvpn-devel@lists.sourceforge.net; Tue, 21 Oct 2025 19:32:01 +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=fzVUxx+iu21tOIT5y8n4mONFwqjQTZ+W78Hx/9+ZP7g=; b=KiykMeHgZ9vG4Tcv5awYr1BB46 JWDTX1CaJjoSYEuPWk8TNM+q0cMGV6iYNH2hgrDH17iqOgQ8uH3vvci3rl+yCxg9Ebnsc75WyL1S7 NfXCKNTNnLhZzKFktAnoMim4WNHlLKomgy9ABTJ680nkAQnSekF+qhiXs2rKpQ1xwLSY=; 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=fzVUxx+iu21tOIT5y8n4mONFwqjQTZ+W78Hx/9+ZP7g=; b=RqCINNWLcPf2PWuaZXsWVop/FJ GUUGq6eHCFt4MUb7bIi26cigqpBcbdYXoMhQyCKJ0VZEwk6uJPBvRHIrVVw0KhA+jzSgT0OcaDOoc MYA/697me9PTFhb3Xu1OemOIf+38IjP7hvzsntPQ5zwqwLGOsOVrvPgT0UIwSkVJs5y8=; Received: from [193.149.48.134] (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 1vBI5Q-0003hp-CA for openvpn-devel@lists.sourceforge.net; Tue, 21 Oct 2025 19:32:01 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 59LJVm9P026801 for ; Tue, 21 Oct 2025 21:31:48 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 59LJVmgj026799 for openvpn-devel@lists.sourceforge.net; Tue, 21 Oct 2025 21:31:48 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 21 Oct 2025 21:31:40 +0200 Message-ID: <20251021193147.26778-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", 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: Frank Lichtenheld maddr.proto needs to be set before the call since that will change the behavior. Found by GCC "'maddr.proto' is used uninitialized" Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1vBI5Q-0003hp-CA Subject: [Openvpn-devel] [PATCH v2] multi: Fix wrong usage of mroute_extract_openvpn_sockaddr 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?1846621111594163248?= X-GMAIL-MSGID: =?utf-8?q?1846621111594163248?= From: Frank Lichtenheld maddr.proto needs to be set before the call since that will change the behavior. Found by GCC "'maddr.proto' is used uninitialized" Change-Id: I76babf08b041162ddedf7a9b7c2799847f15cbdc Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Acked-by: Gianmarco De Gregori Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1292 --- 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/+/1292 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering Gianmarco De Gregori diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index e907524..fa9c654 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3965,9 +3965,9 @@ saddr.addr.in4.sin_family = AF_INET; saddr.addr.in4.sin_addr.s_addr = htonl(addr); saddr.addr.in4.sin_port = htons(port); + maddr.proto = proto; if (mroute_extract_openvpn_sockaddr(&maddr, &saddr, true)) { - maddr.proto = proto; hash_iterator_init(m->iter, &hi); while ((he = hash_iterator_next(&hi))) {