From patchwork Wed May 10 11:22:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 3208 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:7b9a:b0:c3:1364:a2a2 with SMTP id j26csp3535827dyk; Wed, 10 May 2023 04:23:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7OgjowNxnvJ55VU/P9nkURf/vCTUf0+V6KbSy08Qmok/Fm+Yr9sr+aKFpHoeKlMtDcmoUO X-Received: by 2002:a92:dcc7:0:b0:325:eb13:1045 with SMTP id b7-20020a92dcc7000000b00325eb131045mr13876123ilr.2.1683717806141; Wed, 10 May 2023 04:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683717806; cv=none; d=google.com; s=arc-20160816; b=NwHhnq8zBrkWzfWttQNv6NxtwSf/UzMtJE710gtxDWGDkAvR4TOOpPNAkJHDxg0c7h Gxonh9LxM6XsaUo9MPaabbHhGuLC8waoGph7Iy18oak6rdWT50/0jXTt8WuOpKnnUqE5 oPPxZ9F3sNFFqQIVhOnLjKPsgdSFxfT/TlkOpIqcl1LgfVQTyDb+uo7fh6I9SYCQadTr ynVXNoNgtyP8+sEDbglQZ89vBJ5kepaDU6ZjuD/YzcVT0VCroFDA7a2Myz9FGxErNI7b v2uftpGXvWHkihZvijK1rcOHESXEi2Pp12j3z8hLYpjYVCGztkFcYRDFbArEKkAMFtIN cM1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=3PItXtukIO8/gTo6MaBh4qDuLa4EI8EHOV+/hhh3zLk=; b=tYqq+x0Koqb8zqK+BmbCwePV2TL/CxEkr7V0VBM7yYA/2rNBLkFv4igj1PUP6zIT0u HyTO+N3ZCeYAhZ7uGcxP/cG7SaJW8aJ+TUIM4rQ3TCUY4IhNC5xUNhxw1gUdKCoOcWSm 619V6Kbt+SbrRY9ORB8MOoYYwNo+vtK/k1237Yc+ZBhoY1YxjAgKu1NoYUOge1qvw0Sx niB8tQWmculffvn4qYk0H/BlCQV67w2pdBgs1quLPaDby+IwPqIZiZU+5M7WXvZ3DaIC RUoBKsa1i6SvNvUQEdwca7kByfTvZAnwWfR1JTibaG64nBxb7pOy1zhdjtFHLXdRFyCQ 8gcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=EMA3YENA; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=OvSGAKw7; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=Cuzm8k43; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id t5-20020a026405000000b0040fa8c648d3si5646925jac.164.2023.05.10.04.23.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 May 2023 04:23:26 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=EMA3YENA; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=OvSGAKw7; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=Cuzm8k43; 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 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 1pwhuO-0002Qh-Et; Wed, 10 May 2023 11:23:00 +0000 Received: from [172.30.20.202] (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 1pwhuF-0002QB-1x for openvpn-devel@lists.sourceforge.net; Wed, 10 May 2023 11:22:51 +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=wGzV2wQeBuUYYYbg8dV2nvY/2bHf31H6r02U9koomus=; b=EMA3YENAiIeNn6BzgeVLqawMcq nTFM3k6YJyE+JfSHqdF9/dkrK0/+p6zBEHgbRRfuht08DOG2F9G60ciFfWjeBMLKo61ObatQ/G3sL ljP59SuluI+xEP9HXfxg2EDQM6Q5tIqdWo2tKzyjTquIzV+ILGlcnRK7UPdoHFSk3lJg=; 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=wGzV2wQeBuUYYYbg8dV2nvY/2bHf31H6r02U9koomus=; b=OvSGAKw7an5L80s2tJtg1HPGIG fMNAy2TEvaT5gVEINvUlmSfj8mrwMX58EdDZ0POpdIOoOsukfPvYS6eFLSj+T5wC6tDt24+LBvnBE LrYjgsP3R8krRR6hRgkPFcCEsJ9Sru6rEwO/laCGl4VIU9nnNYA3PDtm252ysuVhTexw=; Received: from mout-p-202.mailbox.org ([80.241.56.172]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pwhuA-00260Z-Fl for openvpn-devel@lists.sourceforge.net; Wed, 10 May 2023 11:22:51 +0000 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4QGXgd4HnQz9sbw for ; Wed, 10 May 2023 13:22:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lichtenheld.com; s=MBO0001; t=1683717757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wGzV2wQeBuUYYYbg8dV2nvY/2bHf31H6r02U9koomus=; b=Cuzm8k43jCQ7XyjJE8ei2swBh7HIwUUItEEAscFTqH59PcXfR6T2gjPOD8JiYl40yNdIYX 4BFbe4fLWu0eWFi/N7JgJ5EIn4XUwKui3HopNbyNyIAj4bMxk3E/eTQz9QumwzdI6lMUCs Lehbh2Aog7DXFSbszjIt1cp8WSXgYTqJNX20sr69c8UKfhmd5RIAjOhB1cAK2Td5onDPO8 iiqv5Itqw6YIlLRvlmKQWg6mGuLRktena0h8ux3B5gGcA8RlXq9Qgn/b+6b/WWO/2j+d7o KWGq3ERIXi4AkRS90v3NvlesiAqAcHkqwQ0FGNc9qAoOUgAxhw7o9nmGmehTgg== From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Wed, 10 May 2023 13:22:35 +0200 Message-Id: <20230510112236.248026-3-frank@lichtenheld.com> In-Reply-To: <20230510112236.248026-1-frank@lichtenheld.com> References: <20230510112236.248026-1-frank@lichtenheld.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4QGXgd4HnQz9sbw X-Spam-Score: -0.9 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: Since in the end this always ends up as an uint16_t anyway, just make the conversion much earlier. Cleans up the code and removes some -Wconversion warnings. Change-Id: Id8321dfbb8ad8d79f4bb2a9da61f8cd6b6c6ee26 Signed-off-by: Frank Lichtenheld --- src/openvpn/mss.c | 21 +++++++++++ src/openvpn/mss.h | 4 ++-- src/openvpn/mt [...] Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.172 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1pwhuA-00260Z-Fl Subject: [Openvpn-devel] [PATCH 2/3] Change type of frame.mss_fix to uint16_t 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?1765506082700618037?= X-GMAIL-MSGID: =?utf-8?q?1765506082700618037?= Since in the end this always ends up as an uint16_t anyway, just make the conversion much earlier. Cleans up the code and removes some -Wconversion warnings. Change-Id: Id8321dfbb8ad8d79f4bb2a9da61f8cd6b6c6ee26 Signed-off-by: Frank Lichtenheld --- src/openvpn/mss.c | 21 +++++++++++---------- src/openvpn/mss.h | 4 ++-- src/openvpn/mtu.c | 2 +- src/openvpn/mtu.h | 2 +- src/openvpn/options.c | 1 + 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/openvpn/mss.c b/src/openvpn/mss.c index fd2d3c1d..44b316da 100644 --- a/src/openvpn/mss.c +++ b/src/openvpn/mss.c @@ -46,7 +46,7 @@ * if yes, hand to mss_fixup_dowork() */ void -mss_fixup_ipv4(struct buffer *buf, int maxmss) +mss_fixup_ipv4(struct buffer *buf, uint16_t maxmss) { const struct openvpn_iphdr *pip; int hlen; @@ -74,7 +74,7 @@ mss_fixup_ipv4(struct buffer *buf, int maxmss) struct openvpn_tcphdr *tc = (struct openvpn_tcphdr *) BPTR(&newbuf); if (tc->flags & OPENVPN_TCPH_SYN_MASK) { - mss_fixup_dowork(&newbuf, (uint16_t) maxmss); + mss_fixup_dowork(&newbuf, maxmss); } } } @@ -86,7 +86,7 @@ mss_fixup_ipv4(struct buffer *buf, int maxmss) * (IPv6 header structure is sufficiently different from IPv4...) */ void -mss_fixup_ipv6(struct buffer *buf, int maxmss) +mss_fixup_ipv6(struct buffer *buf, uint16_t maxmss) { const struct openvpn_ipv6hdr *pip6; struct buffer newbuf; @@ -132,7 +132,7 @@ mss_fixup_ipv6(struct buffer *buf, int maxmss) struct openvpn_tcphdr *tc = (struct openvpn_tcphdr *) BPTR(&newbuf); if (tc->flags & OPENVPN_TCPH_SYN_MASK) { - mss_fixup_dowork(&newbuf, (uint16_t) maxmss-20); + mss_fixup_dowork(&newbuf, maxmss-20); } } } @@ -193,13 +193,14 @@ mss_fixup_dowork(struct buffer *buf, uint16_t maxmss) { continue; } - mssval = (opt[2]<<8)+opt[3]; + mssval = opt[2] << 8; + mssval += opt[3]; if (mssval > maxmss) { - dmsg(D_MSS, "MSS: %d -> %d", (int) mssval, (int) maxmss); + dmsg(D_MSS, "MSS: %" PRIu16 " -> %" PRIu16, mssval, maxmss); accumulate = htons(mssval); - opt[2] = (maxmss>>8)&0xff; - opt[3] = maxmss&0xff; + opt[2] = (uint8_t)((maxmss>>8)&0xff); + opt[3] = (uint8_t)(maxmss&0xff); accumulate -= htons(maxmss); ADJUST_CHECKSUM(accumulate, tc->check); } @@ -293,7 +294,7 @@ frame_calculate_mssfix(struct frame *frame, struct key_type *kt, { /* we subtract IPv4 and TCP overhead here, mssfix method will add the * extra 20 for IPv6 */ - frame->mss_fix = options->ce.mssfix - (20 + 20); + frame->mss_fix = (uint16_t)(options->ce.mssfix - (20 + 20)); return; } @@ -327,7 +328,7 @@ frame_calculate_mssfix(struct frame *frame, struct key_type *kt, /* This is the target value our payload needs to be smaller */ unsigned int target = options->ce.mssfix - overhead; - frame->mss_fix = adjust_payload_max_cbc(kt, target) - payload_overhead; + frame->mss_fix = (uint16_t)(adjust_payload_max_cbc(kt, target) - payload_overhead); } diff --git a/src/openvpn/mss.h b/src/openvpn/mss.h index 1c4704bd..b2a68cf7 100644 --- a/src/openvpn/mss.h +++ b/src/openvpn/mss.h @@ -29,9 +29,9 @@ #include "mtu.h" #include "ssl_common.h" -void mss_fixup_ipv4(struct buffer *buf, int maxmss); +void mss_fixup_ipv4(struct buffer *buf, uint16_t maxmss); -void mss_fixup_ipv6(struct buffer *buf, int maxmss); +void mss_fixup_ipv6(struct buffer *buf, uint16_t maxmss); void mss_fixup_dowork(struct buffer *buf, uint16_t maxmss); diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c index 2925b7fe..3c8468a9 100644 --- a/src/openvpn/mtu.c +++ b/src/openvpn/mtu.c @@ -212,7 +212,7 @@ frame_print(const struct frame *frame, buf_printf(&out, "%s ", prefix); } buf_printf(&out, "["); - buf_printf(&out, " mss_fix:%d", frame->mss_fix); + buf_printf(&out, " mss_fix:%" PRIu16, frame->mss_fix); #ifdef ENABLE_FRAGMENT buf_printf(&out, " max_frag:%d", frame->max_fragment_size); #endif diff --git a/src/openvpn/mtu.h b/src/openvpn/mtu.h index b602b86b..c64398de 100644 --- a/src/openvpn/mtu.h +++ b/src/openvpn/mtu.h @@ -115,7 +115,7 @@ struct frame { * decryption/encryption or compression. */ } buf; - unsigned int mss_fix; /**< The actual MSS value that should be + uint16_t mss_fix; /**< The actual MSS value that should be * written to the payload packets. This * is the value for IPv4 TCP packets. For * IPv6 packets another 20 bytes must diff --git a/src/openvpn/options.c b/src/openvpn/options.c index fa435c1d..94859294 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -7260,6 +7260,7 @@ add_option(struct options *options, /* value specified, assume encapsulation is not * included unless "mtu" follows later */ options->ce.mssfix = positive_atoi(p[1]); + ASSERT(options->ce.mssfix <= UINT16_MAX); options->ce.mssfix_encap = false; options->ce.mssfix_default = false; }