From patchwork Mon Nov 2 13:57:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 5550 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:6022:3119:b0:118:2077:975e with SMTP id e25csp5440937laa; Mon, 2 Nov 2026 05:57:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AKwUvBxjbAEYpjql89yg5Ot960I7aC0tQeNQ32sqAIk0UakVGVEGKLLFtbPc2pC8Br6eAYDb2sFXKaNIPYM=@openvpn.net X-Received: by 2002:a05:7023:a5b:10b0:160:90a3:ca8c with SMTP id a92af1059eb24-1ac5cb1c615mr14265794c88.7.1793627869910; Mon, 02 Nov 2026 05:57:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1793627869; cv=none; d=google.com; s=arc-20260327; b=dNlWJjPPCAIilCcD3DvVozKFYk2LyKPQCTe6+0exfUpNt7d+L+vGikYGzDSHwXQf2K P3JSceXAszD0X8K8+szmPL/cF6Uz6R+8RiqW31lNW4O3E2hMvY1UZdljgaasFq1zGik6 NKBO6aah5z6wrYYFfIVj6ng2n2vpdRBeBRG6vU2VApjb9V9kk3Ury4pcvlAu6ihr5JFy TSSUAr1Eak1PIj1nEtRlr1SoRggwZWs/VfQcEsXBGs3lOCQXXCPc7rk4sj0r6nKOGVb8 Egj/i+Edh5WbRUPAcbhMN4j1KLTRDpXCHTsqUKcN3AtjX74r+x37KUoWf9DHNLchn/ls 0eIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; 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=wEH7cKwFTln4if+B0iM7qkrFadi435+6pPJ9Wo42YR4=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=DZ9uPVxNVLUkSRGKftNjN3spp6/j8TuSccYYg5msMrmTM+aBePTGTcPMxtmDmnO+bS i5rPd0dnKWXXNO5X0ecfvk47oBDMQ1QZg2WQrF10mU890Jnio9uMtgVUNXNKm2Uk+ToT TBUJFqC55Ty5yBF+ofHLWs6FEGerSRKkoml6jTI+qTePDk2XnPAh3+Fab3LP5icogErG O7po8pBI/babNfxpg2LvG4wEg82qyCZ95fOTCXRbVIHBL1Pp/QLU6hKIWKQtPftJyFTQ wGrQz/ukAxZfz4FeLlFLsQBOMfia2eM/FtJXKpM/D5ycqGDLqmFdAD+RBzslDsDfCjY3 zDHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=V7XLJzBP; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=YfByiIOU; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="mcY/kL9s"; 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 a92af1059eb24-1ac1a9dd985si28057701c88.69.2026.11.02.05.57.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Nov 2026 05:57:49 -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=V7XLJzBP; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=YfByiIOU; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="mcY/kL9s"; 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-Unsubscribe-Post: List-Owner; bh=wEH7cKwFTln4if+B0iM7qkrFadi435+6pPJ9Wo42YR4=; b=V7XLJzBPuLxZt1 K3SjhepQZW1GPORMpKkPI7u5yxipVLXKjvU/Udkz+SQcaBVPquC9HV0R9sGZ+lPDv2vnUo2bnVCk/ Z0v6kV1JfM9q1flHfF0CnxPm28mN5ahr9WWIZwdO+jtGwx2QsYnRRu3UqsUN1/Ab6xfcaqxQuInOH /lU=; 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.100.1) (envelope-from ) id 1xNsXj-000000006uI-2KJx; Mon, 02 Nov 2026 13:57:47 +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.100.1) (envelope-from ) id 1xNsXh-000000006uB-31Qy for openvpn-devel@lists.sourceforge.net; Mon, 02 Nov 2026 13:57:45 +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-Unsubscribe-Post:List-Subscribe:List-Post:List-Owner:List-Archive; bh=cXMS1zTlu+b3e1nSwA7Q7P9ymm04uBP2wXtgE4gKlxE=; b=YfByiIOUsgU88OkDgUR/V1/t0j wRAe7bK970VjqvwlM6JK10KJdfFDTs0Fpm1bWiZDEOUPteZRdGDvfS431CgsmO5cpfQr1ZgzjhK4i C3zUT/O3HK6rmfTEa6VIbJW2FxCJC2AW9rUxDTVeffEa4gWxuifQAgdTIWnS7z7VhOZ8=; 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-Unsubscribe-Post: List-Subscribe:List-Post:List-Owner:List-Archive; bh=cXMS1zTlu+b3e1nSwA7Q7P9ymm04uBP2wXtgE4gKlxE=; b=mcY/kL9sUxkeOuQIVaHWgTDbs1 OSyDcKq/KnNWgv+wxXMqwA1XlNQpyukFsekwKAArIppto36HTQYMSoTVvt/wm5Pvlj+JeV+onltvG cSJ8qYkccjPmhxk1RUlJklF+W3uxGSBANtAijdSP6kPNtwZgZxb4fdnAqwrhuxh2W0+0=; Received: from [193.149.48.129] (helo=blue.greenie.muc.de) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.100.1) id 1xNsXf-000000000lh-3KMr for openvpn-devel@lists.sourceforge.net; Mon, 02 Nov 2026 13:57:45 +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 6A2DvbWb027403 for ; Mon, 2 Nov 2026 14:57:37 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.2/8.18.1/Submit) id 6A2Dvbe0027402 for openvpn-devel@lists.sourceforge.net; Mon, 2 Nov 2026 14:57:37 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 2 Nov 2026 14:57:31 +0100 Message-ID: <20261102135736.27372-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.55.0 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: Razvan Cojocaru management_callback_send_cc_message() called strlen(parameters) before its own NULL check. Only count parameters and the separator when set, and drop the cppcheck suppression for it. 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: 1xNsXf-000000000lh-3KMr Subject: [Openvpn-devel] [PATCH v2] init: check parameters for NULL before strlen() in send_cc_message 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: 1880755137466546394 X-GMAIL-MSGID: 1880755137466546394 From: Razvan Cojocaru management_callback_send_cc_message() called strlen(parameters) before its own NULL check. Only count parameters and the separator when set, and drop the cppcheck suppression for it. Change-Id: Ib9164e1c8f5e02a2253bbb3b2363a4f9f31c8bdb Signed-off-by: Razvan Cojocaru Acked-by: Frank Lichtenheld Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2085 --- 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/+/2085 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Frank Lichtenheld diff --git a/dev-tools/cppcheck-suppressions.xml b/dev-tools/cppcheck-suppressions.xml index 33337cf..926ecde 100644 --- a/dev-tools/cppcheck-suppressions.xml +++ b/dev-tools/cppcheck-suppressions.xml @@ -198,12 +198,6 @@ src/openvpn/dco_freebsd.c buf - - - nullPointerRedundantCheck - src/openvpn/init.c - parameters - redundantAssignment diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 24cf532..6c87865 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -299,7 +299,11 @@ management_callback_send_cc_message(void *arg, const char *command, const char *parameters) { struct context *c = (struct context *)arg; - size_t len = strlen(command) + 1 + strlen(parameters) + 1; + size_t len = strlen(command) + 1; + if (parameters) + { + len += 1 + strlen(parameters); + } if (len > PUSH_BUNDLE_SIZE) { return false;