From patchwork Mon Dec 15 15:23:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4685 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7001:1490:b0:7b1:439f:bdf with SMTP id bf16csp1890815mac; Mon, 15 Dec 2025 07:24:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU4hgrSdA1Wb48vEu7oiRzJ+RkAqYuAT6CKkfOrTpwcwrphDxSPaKCs215eAXAn0kzWXdDhQlLz8Ws=@openvpn.net X-Google-Smtp-Source: AGHT+IFatPMxrDmscEJJM8kBUTWEMIeF4pCMPNiBNXfNIHDHhARafWZHZ2dwRxf1aJHnyU4ViMMM X-Received: by 2002:a05:6808:bc3:b0:44d:8e2c:41c0 with SMTP id 5614622812f47-455ac9101e3mr5536854b6e.35.1765812248630; Mon, 15 Dec 2025 07:24:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1765812248; cv=none; d=google.com; s=arc-20240605; b=i2EUPxkqKycx3/usswc6hNenkk11xZ++Gtq6OulysZTNz6slFvNiVJIuIPWoKcNpzB fWpTzy+uJhiKbOt6hMPrC84KMyKHvWETGjsVs4DxUfY84RuRN0kGfM6xzvIjkXKDnWa9 UYgzTYecKNrcY2e/tUKMYUP1CpOR3FTZtItA4WzdGts0d9hys+25AIeWMPzMSjz1UZoi 0o0Uv27N+FAai0hhl/USz9kJfSwKYqqoEssSPjz9NdGpFSB7SU0c1cA3wRkoxJ4MAtH/ jouhy+O8e9XkxxEiXM9vdw8TgzLUZKvVFlj6X73AVKLQqDO6yxkQNEAUnfYTCCTFMxdZ xtQQ== 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=kpdyLr0xJ9dbEF8lsDBBoObrG0CyKbtemS/4fqz/kxc=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=DVXkTRgY7Yl2szUvvWB5YWk1iSBF5KwSqczeI5nsAhOO0+o+7vS/3nSLTvNCCfject Idd/MhtaofuW43VJ8gblKJaG0Rh5X6ZZ1+XlJKOGsTwBuyYydv5HSSq+7o7bC/aQ5TRc 27wJuIj2HDlYiYk9ABiMON2AMJ+/BINfPTAgZi5R2h0e9TqxlMthwt5VaVGvzWCZ8GAu XR200DU8pyzeEUDRIHSnMh7kucLDijDkXGduEk3cQOQir8s0wXFAmbmC26Dc42n8oqHn 8fcST77xPloj9Yj1mP2rC6RfuWcaAx7hSXinubNmYceOGgU6zrXiUzTmk+tGdl5ispTw Ibrw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=A0iRDCto; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=KSDajMBd; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Xe6J2Tsx; 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-45598d83fc2si8677661b6e.89.2025.12.15.07.24.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Dec 2025 07:24:08 -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=pass header.i=@lists.sourceforge.net header.s=beta header.b=A0iRDCto; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=KSDajMBd; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Xe6J2Tsx; 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=kpdyLr0xJ9dbEF8lsDBBoObrG0CyKbtemS/4fqz/kxc=; b=A0iRDCtogWrsiuyxP+7D/8NsrH Q3YyqA+vu7N886HzzxGhcjDL1BWdCyeDl3VkEumMdvL/qYT+rj3Jga15zLE9D+mlN8a6Nnqw0E6vr M/wWWmfgexBThZvwlVMBmXb62EA7WBGu60fbysr57QmekIXRBo44kSRiZ98+RKv6M/4U=; Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1vVAQf-00073L-MW; Mon, 15 Dec 2025 15:24:05 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1vVAQe-00073F-FN for openvpn-devel@lists.sourceforge.net; Mon, 15 Dec 2025 15:24:04 +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=6whn9BesIXgFlUq/dDq09dhWjXhAuoxKmQ56scy0CE0=; b=KSDajMBd3jHvalTuFnKZcuTMoP HV6sR9h2mUlKBcmNMbCvlfW6ebBDybSTk9/KJbL/mU0+7HlCpZonT38Y2Oia1iBm8vdhcVK5X/9ps eX60x0pRDdOLGg1drmdaNlL1c6mVkYZU35yROku3eoy5GwNbXJZ5FVPgRtBGfUY3G+N4=; 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=6whn9BesIXgFlUq/dDq09dhWjXhAuoxKmQ56scy0CE0=; b=Xe6J2TsxP+Ez+uWdXQ7ucnvIWq U5dbD72NO3kg/uvFjdiG5+gOgEtYg8V1072sIzc2UHPU0o2Nw+lb10d0nAR8P96qF7HtdcEN8xGQi 4Fpd7DbwnGxd3iQjZA9mfREnCIzIgUFe24K1Gn8dz2QULruZv+Dz/TiWHBrV+ywe1bfg=; 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 1vVAQd-0003Yk-4O for openvpn-devel@lists.sourceforge.net; Mon, 15 Dec 2025 15:24:04 +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 5BFFNuX7020668 for ; Mon, 15 Dec 2025 16:23:56 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 5BFFNu27020667 for openvpn-devel@lists.sourceforge.net; Mon, 15 Dec 2025 16:23:56 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 15 Dec 2025 16:23:50 +0100 Message-ID: <20251215152355.20654-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.51.2 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 Change-Id: I0c5ef13d6fa6c1dd15da934a33e904c2fdacb731 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/open [...] 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: 1vVAQd-0003Yk-4O Subject: [Openvpn-devel] [PATCH v1] manage: Avoid several conversion warnings by using the correct types 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?1851588344500878905?= X-GMAIL-MSGID: =?utf-8?q?1851588344500878905?= From: Frank Lichtenheld Change-Id: I0c5ef13d6fa6c1dd15da934a33e904c2fdacb731 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1438 --- 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/+/1438 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 6efa100..2191e55 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -206,11 +206,6 @@ return man->settings.up.defined && !man->connection.password_verified; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - static void man_check_password(struct management *man, const char *line) { @@ -220,7 +215,8 @@ * the attacker choice, it should not give any indication of the real * password length, use + 1 to include the NUL byte that terminates the * string*/ - size_t compare_len = min_uint(strlen(line) + 1, sizeof(man->settings.up.password)); + size_t compare_len = + min_size(strlen(line) + 1, sizeof(man->settings.up.password)); if (memcmp_constant_time(line, man->settings.up.password, compare_len) == 0) { man->connection.password_verified = true; @@ -241,10 +237,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static void man_update_io_state(struct management *man) { @@ -2315,19 +2307,14 @@ #endif /* ifdef TARGET_ANDROID */ -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - -static int +static ssize_t man_read(struct management *man) { /* * read command line from socket */ unsigned char buf[256]; - int len = 0; + ssize_t len = 0; #ifdef TARGET_ANDROID int fd; @@ -2348,7 +2335,7 @@ { bool processed_command = false; - ASSERT(len <= (int)sizeof(buf)); + ASSERT(len <= (ssize_t)sizeof(buf)); command_line_add(man->connection.in, buf, (size_t)len); /* @@ -2414,11 +2401,11 @@ return len; } -static int +static ssize_t man_write(struct management *man) { const int size_hint = 1024; - int sent = 0; + ssize_t sent = 0; const struct buffer *buf; buffer_list_aggregate(man->connection.out, size_hint); @@ -2435,7 +2422,9 @@ } else #endif + { sent = send(man->connection.sd_cli, (const void *)BPTR(buf), len, MSG_NOSIGNAL); + } if (sent >= 0) { buffer_list_advance(man->connection.out, sent); @@ -2457,10 +2446,6 @@ return sent; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - static void man_connection_clear(struct man_connection *mc) { @@ -3222,8 +3207,7 @@ if (net_events & FD_WRITE) { - int status; - status = man_write(man); + ssize_t status = man_write(man); if (status < 0 && WSAGetLastError() == WSAEWOULDBLOCK) { net_event_win32_clear_selected_events(&man->connection.ne32, FD_WRITE);