From patchwork Wed Sep 25 14:06:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "flichtenheld (Code Review)" X-Patchwork-Id: 3874 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6c93:b0:5b9:581e:f939 with SMTP id p19csp344531may; Wed, 25 Sep 2024 07:07:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWDl6GPvwc513+dc9WGDUra5b/wl4QtM73v0B6eFTAGrxIGoVW8urD82LOHomboULgza599CRIK/Bo=@openvpn.net X-Google-Smtp-Source: AGHT+IFtY5yd9vqFurqOmOLhp+KgERZveqln/Hpm/BDqLfR7g6W7Y9nj5gObtblAynu7LcyA8QqJ X-Received: by 2002:a05:6e02:1384:b0:3a0:5642:c78 with SMTP id e9e14a558f8ab-3a26d79ad7cmr31331165ab.15.1727273247105; Wed, 25 Sep 2024 07:07:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727273247; cv=none; d=google.com; s=arc-20240605; b=EuklJ6N9OIoys0VX3LfWjUNXhhqq5EIDPeL9d6Crnr4fVxAfmporqQUk9DJrS8daPw Tq0ghkyLUhoFYOML3cCJW9sIjdkeUoG+SfcNPbhFmuJbJU0ixCTE+Xhruqdra9bIZ5S1 65vbLQDa40jnl/mzwegP0BZH/MH7WgDQdZzf5Dx48fY7pr0A2Y3mKCA8SZtvRyVBG49g PuaVHnLwAL8twmpMP/vBLo4rQoK8a4/zResvpOfqo07xJHhW5TXPyfnNCmw2R1gprFvg 05Alk47rhacnRNF9mc3a29XJln7W9gxZgW1AjLEw9Z4DQmfhOTQkzM/ywInU/98qBSLc FZWg== 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=iL0BozuNCyCXhWEVl6s6iv2iywWmpa+eFi7J59W09Qw=; fh=lm0MLPW7DntlrDqRECIiC9JlE1uPxhepE0URYHIf+eE=; b=lU/cuAzGoIKJQJTMGnI9gMFXvHoSzzFALfpsBqmzSWHQnrT7jnCvdiP27hAP8PFBqd FjEVZjzAB/UtnMHNJnXRkKbmYd9rIC6WmDd/Ds2IDz7XSZAxJEkYuvGSmfhoRcxn9dK4 e5+u21ntdHgaFNV2RFae4T/zstk9mM2mXdgnREpc2UYg4aPjJxyqDiRIqf2TUzGHy58I Ajfh7YLOpnvWema1xXAUgzOOdHAUNhxq/cC7P7Soi96kl9OCmpQTAloA5teg97Ep9CoD sSfkgN8WBu4vLWCjyQdk/WLrF8XxJcbSqh4m40g6NJu+5gPyh/T0LcX+W9Ux1SXIpm8d h00w==; 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=mEC9Q27t; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=e53ERUDQ; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=LtcJ13rU; 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-4d40f302472si1761727173.128.2024.09.25.07.07.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Sep 2024 07:07:27 -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=mEC9Q27t; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=e53ERUDQ; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=LtcJ13rU; 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-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1stSfi-0008Hj-Kq; Wed, 25 Sep 2024 14:07:14 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1stSfg-0008HP-H9 for openvpn-devel@lists.sourceforge.net; Wed, 25 Sep 2024 14:07:12 +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=fZr3FuQMQTvcoj/C9g3EMe0Ixuh5pYRSjqM40aZUy0Y=; b=mEC9Q27t1ejWY7tKmXlk+Y3Oq0 cKrRT+ZlQkxY/AqJ/aRsztZqCM/6wULF21uBOBifQPkYHEL33xJcDP0l8CMcIvPC7uExDfg3qZ2oe YEG9JrRIZB1UwGXqM6QAqAH4QWjTkOyAxRbftKG0QQw9mmaF+hM9l7cY4IqSjT4is0fM=; 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=fZr3FuQMQTvcoj/C9g3EMe0Ixuh5pYRSjqM40aZUy0Y=; b=e 53ERUDQEHnKMefZREP3+b2+IesFHaa2/9uRqmTjMGUp4yp//1EqLP2Kw8Jbcy/1r1VGVx6mXSf2Vx +g95dDalgGcNC/XUiar44taaVbo50kqHT1I2gW3FZTnzkyrX0EVwDX1qClDzMNB/MaH3mGKJwhD1L OPPV0lmlNSYc4/EA=; Received: from mail-wm1-f48.google.com ([209.85.128.48]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1stSff-0004pb-PO for openvpn-devel@lists.sourceforge.net; Wed, 25 Sep 2024 14:07:12 +0000 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-42cd46f3a26so59556705e9.2 for ; Wed, 25 Sep 2024 07:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1727273220; x=1727878020; 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=fZr3FuQMQTvcoj/C9g3EMe0Ixuh5pYRSjqM40aZUy0Y=; b=LtcJ13rUsq6N+NgbxALe1CE/DH46E3dTjQgxIi1ibMjEIRa9OIPfmB1AcoqzLPjO0d Xy9x+5Y3TvusCjDJPtm9/Qz3BD8e6ZsmwGTPgVSxfdaoYsHxuOc/w04ZOHGVBo6eQfCg uXM1JxMOKkkPECLYJb8lSEBEdoUjolqDszHNvH8vC+6sxq68jtpkxAw0BhaaIoWexAg+ FmVt37bvfk04rS3aHIB3JjJWSg6vpBiGEk0pcrbLLWCFStQtad23JwoRTRShizIyWENu jbWDwARd9G4R+NbKCdA+irZmrdD7tcOHK1rUB1u+8ejUqeIghio+vN7fNY/ibZTJwZbC IrCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727273220; x=1727878020; 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=fZr3FuQMQTvcoj/C9g3EMe0Ixuh5pYRSjqM40aZUy0Y=; b=Xmxr9HL96iFNmqLrQbr4jHHw5c+s8/QSOVLqeTDn//wN7koJS4lsx/O8YEHdxPUKaA Im8A6e8uzIgwRu4PeAnV7gv7vmhb2lU0OyiZr5fZb4RBTbanWAq1bTaxQiRFBlJd+oym fmJd8XtynZma3aD0p1mC+F92erMyt0Nd+L77sDTQ+gDu2IwNUDkioheEqbMJICdLsdot 2vAxcQ1vMIgoQbX0wcAx8vs1bSHZyG1065qSgGJrlgLKiCKhMi0QsrI4OoJ/7n3aN3O+ 2cfRrFgWdiOSFn1RJMl5HEnqbMjRhDtXrPO2Cs/Jo+wkQXci8WI/7L3+Sf++0w8VbwLY 961w== X-Gm-Message-State: AOJu0YyhIcjq+s98pDGtqG5IcdhvnSj1PQh/DBRdGUng3LSEb8vbFjgs Q2qZp7fdWsWuDR54qDQ/yhUONED0ypPpd1CmbyTHJBe2XmLWoClEnPC+R6E/rAIOkvImF23Ca6d s X-Received: by 2002:a05:600c:3d97:b0:426:6e86:f82 with SMTP id 5b1f17b1804b1-42e96147a7fmr19133645e9.22.1727273219963; Wed, 25 Sep 2024 07:06:59 -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 5b1f17b1804b1-42e96a1f333sm19887195e9.44.2024.09.25.07.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 07:06:59 -0700 (PDT) From: "plaisthos (Code Review)" X-Google-Original-From: "plaisthos (Code Review)" X-Gerrit-PatchSet: 1 Date: Wed, 25 Sep 2024 14:06:58 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: Id99a3ba13c0f1d0bc7e4699fb67ee9dff6221639 X-Gerrit-Change-Number: 770 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: f4222becb32af105ef6278cba50944ed9f8d203c References: Message-ID: <1838210b47c0914e3119d4f491d6c9a6f8bb5c35-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -1.0 (-) 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. Hello flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-1.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.8 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.48 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -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.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1stSff-0004pb-PO Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Fix socketpair return status not being checked in port share code 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: 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?1811177272053587910?= X-GMAIL-MSGID: =?utf-8?q?1811177272053587910?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/770?usp=email to review the following change. Change subject: Fix socketpair return status not being checked in port share code ...................................................................... Fix socketpair return status not being checked in port share code found by Coverity after tun_afunix introduced another call to socketpair, so it started to complain that we only check the return code in 4 of 5 cases. Change-Id: Id99a3ba13c0f1d0bc7e4699fb67ee9dff6221639 --- M src/openvpn/ps.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/70/770/1 diff --git a/src/openvpn/ps.c b/src/openvpn/ps.c index 4ca3a12..129f65c 100644 --- a/src/openvpn/ps.c +++ b/src/openvpn/ps.c @@ -234,7 +234,12 @@ } else { - socketpair(PF_UNIX, SOCK_DGRAM, 0, sd_null); + if (!socketpair(AF_UNIX, SOCK_DGRAM, 0, sd_null)) + { + msg(M_WARN|M_ERRNO, "PORT SHARE: socketpair failed -- unable to communicate with background process " + "(%d, %d)", sd, sd_send); + goto done; + } memcpy(CMSG_DATA(h), &sd_null[0], sizeof(sd_null[0])); } @@ -246,6 +251,7 @@ ); } +done: close_socket_if_defined(sd_null[0]); close_socket_if_defined(sd_null[1]); free(mesg.msg_control);