From patchwork Tue Apr 25 10:20:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 3196 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:3242:b0:be:2c52:f7bc with SMTP id j2csp3090108dye; Tue, 25 Apr 2023 03:21:08 -0700 (PDT) X-Google-Smtp-Source: AKy350ZmT05wU4DJB+f7Wp8M2BIxPYXFN6HNPGQmt0q0Xhu2f8mUUc8bzmcmu9f9UWglxnRhFvWA X-Received: by 2002:a05:6602:20cc:b0:758:d81e:31b3 with SMTP id 12-20020a05660220cc00b00758d81e31b3mr6719310ioz.19.1682418068602; Tue, 25 Apr 2023 03:21:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682418068; cv=none; d=google.com; s=arc-20160816; b=cFeTfm69QgyM/M5N9UqV38rFLfGZ1FOsnbD+brbAAdg2ciHcxT+kIonapK9lx70nWL yx56TDxHTWJWRXYBPkjniZ+4Feym6cIt+5MowzMIvuhgUvV/eFeahPj2V+/L0+qOz+5D paeENRqgEyoVUiyrlcONaIp+1G1zPxYGYEq1mYL/B94NUshXTUlNk4jbkL0xpJ2dopQO TnM0psfzQl0nhLChLABztgutki19lURQMTapU5bQUhVg4knvchTYo5MN6dAfegu+LtSI +Cmc46C++jvH13qYt2hL8w3SVUN3d41CxkqcT6uyhE3J9dbbNLy+EA914RRxJQyracrS KAKg== 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:message-id:date:to:from:dkim-signature:dkim-signature; bh=RALEmC6i4Zs7duSIinZAg1xmhnsu4LtxMn51fiKCB4E=; b=PoBw7/190mRXwROqAQ0TPia/QfGG3vmhiKSfQsFusKr5KoBWKkZLOF3oXfvl27vIYe zovftwGdRuL2NZr9i9qJbZt7F1JVeXiyc2GlSRsLdVEsZH/ZwUxW3l0twmMs/srhi+9v lbje1Tua8Bi3rowjF5cT0DsC108aK4sRIhu+S34Y14vHNJ6j90/mCkhF2mWtD7k5t98G pyPXD1PkbG95C4oGKWcOj5OuxigqpdaNPMI8JKP9HX+j8iJT9mSwOIPVFJ3Ok28tCDtk pvY6FAuZdCgJhjFAtF+MSCHQjGhh42u/WKTAfewEz9Eq2wvlX/ah0ubOCGp+hnXE3WX7 k6Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=ScYzv6Nt; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ATn3RAVi; 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 a2-20020a5ec302000000b00760f2ab5637si11155054iok.62.2023.04.25.03.21.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Apr 2023 03:21:08 -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=ScYzv6Nt; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ATn3RAVi; 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 1prFmn-00070A-Qm; Tue, 25 Apr 2023 10:20:37 +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 1prFmm-000703-Jp for openvpn-devel@lists.sourceforge.net; Tue, 25 Apr 2023 10:20:35 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=GWDpAsf/w7K/nCtXPRnfbDEl0BDeoLIp5c+Hes0LMGs=; b=ScYzv6NtLKuRG8TPIfxEsAuO2K +lgeHSw4kkW6VvehKPVvZoyl7hdl1pHlthGqYeSbDKBHutwhCXvOKMQrkxMYZMi4w/rqOYE8WPtW8 KMVRXhu4D4gyrhrMNqgGJRVQuJq4wQIaw9QwsJkh7Dd8O854NuBL2l4mjj9iAVQ051RI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=GWDpAsf/w7K/nCtXPRnfbDEl0BDeoLIp5c+Hes0LMGs=; b=A Tn3RAViyOSBzQb3RupjdOxExxaUEj01wn2LeXZoZ3AOG76r1ddVOOWYBRn+uA7tD7VK+f21Cd++ca ljph6V6XZJ6kKwxplSKnXh8/NR5GeRH4CF3XUzmX08mKnIRcUgrVCzzpN2Pz8g6eN65323Eb+eQ2v ESBU1Qn+d1oa15t0=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1prFmj-0002ek-OI for openvpn-devel@lists.sourceforge.net; Tue, 25 Apr 2023 10:20:35 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1prFmX-0007Xt-Ss for openvpn-devel@lists.sourceforge.net; Tue, 25 Apr 2023 12:20:21 +0200 Received: (nullmailer pid 1041801 invoked by uid 10006); Tue, 25 Apr 2023 10:20:21 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Tue, 25 Apr 2023 12:20:21 +0200 Message-Id: <20230425102021.1041755-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Score: 0.3 (/) 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: This can happen if the memory alloc fails. Patch V2: add goto error Change-Id: Iee66caa794d267ac5f8bee584633352893047171 Signed-off-by: Arne Schwabe --- src/openvpn/dco_linux.c | 7 +++++++ 1 file changed, 7 insertions(+) Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different X-Headers-End: 1prFmj-0002ek-OI Subject: [Openvpn-devel] [PATCH v2] Add missing check for nl_socket_alloc failure 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?1764143208909531584?= X-GMAIL-MSGID: =?utf-8?q?1764143208909531584?= This can happen if the memory alloc fails. Patch V2: add goto error Change-Id: Iee66caa794d267ac5f8bee584633352893047171 Signed-off-by: Arne Schwabe --- src/openvpn/dco_linux.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 41540c0f8..95fe94848 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -83,6 +83,13 @@ resolve_ovpn_netlink_id(int msglevel) int ret; struct nl_sock *nl_sock = nl_socket_alloc(); + if (!nl_sock) + { + msg(msglevel, "Allocating net link socket failed"); + ret = -1; + goto err_sock; + } + ret = genl_connect(nl_sock); if (ret) {