From patchwork Fri Mar 14 04:21:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "d12fk (Code Review)" X-Patchwork-Id: 4180 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:7046:b0:60a:d70a:d3c7 with SMTP id t6csp353109mat; Thu, 13 Mar 2025 21:22:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPsJNOTx2KjK9O1fb87YwRoL7eO4cjlrkbq5LLPGQkazvZ3sRH+uUzP0ZIC2qonsZZ6IEvMkpzNt8=@openvpn.net X-Google-Smtp-Source: AGHT+IGs6nx1cz0XbADmO+3fPCBxasyMvummq+tByR+t7J4zxOZFjqLkgVMaiXDEBu4A7HLvNGIQ X-Received: by 2002:a05:6e02:3f11:b0:3d3:f2cc:fb5 with SMTP id e9e14a558f8ab-3d4839f5c64mr9584375ab.2.1741926129388; Thu, 13 Mar 2025 21:22:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741926129; cv=none; d=google.com; s=arc-20240605; b=gT0jo40YZV4kgpCr4l/KjhXz+QMl02FxIE3hZUWgzYJBA61zkiJcFlSXTeOlQQ6mEM rwiw8QT/sVG36ktjNcNtHk2XTDBBaMdi4kVp5pxF6Mv7oKFJBQbQ1QQkt58aOwGo2TZD /UaNKcrvdIZv6qWnuR1zP0QmAqIJrVqzRZaLu+4FbTG0ndO1KB4Y9Zuby1K9J6MBNR80 JWvjJa901ykMJ2D8uAqzfc64k+Qqz8Ay7qPfw6SmCqj8QvTOJIagaMAHHayHvT0fuPyz aKJCpm178QGZsRNVYtU08iRBMILxUrGS5Aw9jjZmv3NWiDBUS36+pY6XTFnCOZbTyMuy 491w== 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=9DPjWViU2cHbHRJFeSkByKK9aP4A/fRGFrxFakAbzyc=; fh=U7wEyxtwz2o5+UdevFSA47vNeG9knhWH0KV//QhD5a0=; b=Jd3QXYKjTVi8AEbd2D6OLphmg5xIhpC0Vd1+onA7TdL/UsP21MF26Gx31bgWa76tI4 18e254vUyVLzFkbXEtMxRYr+Rqw3k4KEmRwBJ/mTrbBbtlk1RkwdheHfAf8x/EnzvNDQ h8YlPEP0O6xpH5XnJPMRSiU4aQcP1K3fQOgnYCWa7cTJKQY5xdQTGOMIAAab7DR5c19o eUcGXDucflSLrg5TZyH5mP7f5bUdakizduquuiPz28132SThhZQWlH+zFLeWiWBDXzpF khjn0IfJsxw8mUqKXMrrGthLEVlgaI4IIU/rhPxccePBr9hhVF5h56ex5Cx2QqlmWiNs 6qQQ==; 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=CM6RHWBO; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=IW4MR9SS; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=G6imo8Ei; 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 8926c6da1cb9f-4f26381080csi1931719173.126.2025.03.13.21.22.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Mar 2025 21:22:09 -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=CM6RHWBO; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=IW4MR9SS; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=G6imo8Ei; 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-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tswYh-0007kI-J7; Fri, 14 Mar 2025 04:22:07 +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 1tswYf-0007k9-Nv for openvpn-devel@lists.sourceforge.net; Fri, 14 Mar 2025 04:22:05 +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=08e0R5MsCilEyF1gx91yGWuqgXgYKfIIbmSXXUOhsEk=; b=CM6RHWBOHq+KWGBVnuQDEo6Nw+ JjYorrFt2kmkWJmRKW1jtJqIjghsLhq3AuXpqe1NRkUjqUo0CIIWYQsQ9cPphDHT4qMXYn+iYJACj fiE2xx/V3znzOUYMdPirKJVHrhinw0hFMjQtrR71rHXB41vQQvPSiKt36SJ26qVDmEDw=; 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=08e0R5MsCilEyF1gx91yGWuqgXgYKfIIbmSXXUOhsEk=; b=I W4MR9SSwP+qF1lz6VdlBAVoO8Nngg/Qu6WxQpXx2uJjVe9yUZzS7CHcknktXS/musCH70VVkpf7i5 BXOPgjsBExNxwhODXPpRGLRC2tAZ5QDFCpIIN5UuXOm1xaVHUu4IHQK7jwukECoquPBgc8Cs1fQxQ VElhS+IvtyRKc+r4=; Received: from mail-wm1-f47.google.com ([209.85.128.47]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1tswYd-0001TI-8b for openvpn-devel@lists.sourceforge.net; Fri, 14 Mar 2025 04:22:05 +0000 Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43ce70f9afbso15064195e9.0 for ; Thu, 13 Mar 2025 21:22:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1741926117; x=1742530917; 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=08e0R5MsCilEyF1gx91yGWuqgXgYKfIIbmSXXUOhsEk=; b=G6imo8EiU09Ey1mkglMEfjkQ78xEhF/bULNmIlFYXRQ2Ustt1w5ajmT8cmigYFPtqJ W7bRlev+jYYshzrsHmhydkYGztuErNUJFFvnhTUU/XtVXDzf2PF1ZEzbZf5gVujpx+a9 SiwRqi20jb2BA7m/w/CoqXkkNXru2OZ9lKJOLS62gAZ/tLoCJETBYrwpfmEKC/g0m91F L2I2LceRkm6u3wK9jpDfPmxPj2HkdH4SLjP4Zy024go0AuoTcBIbfX14LMu3kbZjFZWZ z8JQtWBj+3/T87orPDtUoegwjUH0rs94kwwQTqCH5ljRMuaq4NX3dYqIjB+t+XnYneAz lpCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741926117; x=1742530917; 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=08e0R5MsCilEyF1gx91yGWuqgXgYKfIIbmSXXUOhsEk=; b=Ugi5FkBlsCSuCQiSEgbCIThTjfsj0//ERTQo6eDu13PYboSA0mJ3Rshne38CYWJr1s q1GSfm0dgxqmSh4AcRIUgPEtYJ1i7NayVwMI2K1ICy5TlmmPrbgN5lE8ApLkt86gusi4 3Wc7XODG2C4MrYkxWCf/kijSFD2n8k5btRPvjc3kS3cb7mVMywJCmXjcnuPpKPBinbNJ dGMGG1S/NJb9WwzNdmIX9lYUASkdJ4Rjr8FyNTFqu8/fmbRgQw0esMZdRUagwNd0xfJa j1wZV9f6z7ge7/BSAv0UXAix3YJzZ+15IVTvoPFqP9X3WALqhOxk67JEDjfZxIsNZ8Ua Z/jQ== X-Gm-Message-State: AOJu0YzEqaX34eGLP3hDc1kN37pBns60HJFfq4K+ZHUmVOpuMLaz5zXY VYirnh2R4f8043yR1UdyDea+GTKbLMtcKWBSjupyY3tbkD3/LIUyJw1RG5bY8y/5htLDD5XPQ2F xB67dfp8dmYxiI0jQp+sbI5GPwrysI3Apw43p2YaKsIQ5F8eJhG9JoX/1WAxYVnP2 X-Gm-Gg: ASbGncslfWgsZ7ofXSzH2lDZuZDZ13Ha+3nCyKWGQXBj0Qxut8893AYelRBOf6D/Lpa GRSJ9r2KpdDGqJYJkiPKI3eHgyXUU/Kx5nQ3MmxWxUj0C6plW1TExPVFJwaSiIlfiVOzdJ0tvw0 a0XGj0UX62fc5C+OroZS3GRqugs1RLZFyZiLIBG+gHFlV5s3hFxL6vFTr7nfon5epUoeOsIO0JZ bfM/qMXHd8YFPPGeShczq54NJgsIwqYTZQHukrwYIPFH9Czp4yEg6XJpIwyP9o4P3VixC12xXRc 30mbPbRc6+7x5xiz0JkAk68Wfr5wS+ePAK7H9y6ED8cTP7CgRy4JZHh1GY82w+8KYeeLEYRxjx0 yWc5qNENzpc1zn8Vaa1qnBq78yma4Tbuj03V9 X-Received: by 2002:a5d:5e0c:0:b0:390:fe4b:70b9 with SMTP id ffacd0b85a97d-3971daeb6cdmr879898f8f.21.1741926116617; Thu, 13 Mar 2025 21:21:56 -0700 (PDT) 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 ffacd0b85a97d-395c7df35ecsm4260441f8f.16.2025.03.13.21.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 21:21:55 -0700 (PDT) From: "d12fk (Code Review)" X-Google-Original-From: "d12fk (Code Review)" X-Gerrit-PatchSet: 1 Date: Fri, 14 Mar 2025 04:21:54 +0000 To: plaisthos , flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I23710b1f5b2122ec1f14465911836c0f0afa9c64 X-Gerrit-Change-Number: 908 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 49d9e3aba3fb86994d4c48b6303b3db26edb726f References: Message-ID: 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, plaisthos. Hello plaisthos, 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.47 listed in list.dnswl.org] 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.47 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_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.47 listed in sa-trusted.bondedsender.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.47 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_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 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1tswYd-0001TI-8b Subject: [Openvpn-devel] [XS] Change in openvpn[master]: win: calculate address string buffer size 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: heiko@openvpn.net, 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?1826541933143712038?= X-GMAIL-MSGID: =?utf-8?q?1826541933143712038?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/908?usp=email to review the following change. Change subject: win: calculate address string buffer size ...................................................................... win: calculate address string buffer size Instead of making the string buffer statically sized for a max. of four addresses, calculate it to hold up to the max number of addresses a dns_cfg_message_t can hold (currently four as well). Improves the code so that it doesn't rely on the addresses never being more than four in the future. Change-Id: I23710b1f5b2122ec1f14465911836c0f0afa9c64 Signed-off-by: Heiko Hund --- M src/openvpnserv/interactive.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/08/908/1 diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index eb3c867..90af02d 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -1866,9 +1866,10 @@ int addr_len = msg->addr_len; /* sanity check */ - if (addr_len > _countof(msg->addr)) + const size_t max_addrs = _countof(msg->addr); + if (addr_len > max_addrs) { - addr_len = _countof(msg->addr); + addr_len = max_addrs; } if (!msg->iface.name[0]) /* interface name is required */ @@ -1918,7 +1919,7 @@ if (msg->addr_len > 0) { /* prepare the comma separated address list */ - CHAR addrs[256]; /* large enough to hold four IPv4 / IPv6 address strings */ + CHAR addrs[max_addrs * 64]; /* 64 is enough for one IPv4/6 address */ size_t offset = 0; for (int i = 0; i < addr_len; ++i) {