From patchwork Fri Apr 17 15:18:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1089 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id WLH+EMpVml6EXgAAIUCqbw for ; Fri, 17 Apr 2020 21:20:10 -0400 Received: from proxy4.mail.iad3b.rsapps.net ([172.31.255.6]) by director10.mail.ord1d.rsapps.net with LMTP id sMlPDspVml6vYAAApN4f7A ; Fri, 17 Apr 2020 21:20:10 -0400 Received: from smtp7.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.iad3b.rsapps.net with LMTP id mO6sCMpVml5BBwAA9crAow ; Fri, 17 Apr 2020 21:20:10 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp7.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=unstable.cc X-Suspicious-Flag: YES X-Classification-ID: be5f16f6-8112-11ea-bac6-525400e292e5-1-1 Received: from [216.105.38.7] ([216.105.38.7:57654] helo=lists.sourceforge.net) by smtp7.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 42/25-03885-9C55A9E5; Fri, 17 Apr 2020 21:20:09 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jPc8e-00053l-Fu; Sat, 18 Apr 2020 01:19:20 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jPc8d-00053Y-3v for openvpn-devel@lists.sourceforge.net; Sat, 18 Apr 2020 01:19:19 +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:Cc:To:From:Sender:Reply-To: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=C57f0ANwkaSbVkKoA1xc4TRvNSbRl1Mrh7j5o3EF2mo=; b=Bisgwf961qYSxm+pYpz6xUgGEq SQqb6M03yOWfl9Ys+j9lsgDT7tET1UTs4hbz/WBOBdIGjgLZ7p1fViVobfYlmit7btQSMnb4zfTNh z96NZlCwyMwETD69ekeXwFzQCS9Qx4okVByb1VijPOnMqgclWXSvu2O+KvX8kaL/6zPw=; 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:Cc:To:From :Sender:Reply-To: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=C57f0ANwkaSbVkKoA1xc4TRvNSbRl1Mrh7j5o3EF2mo=; b=O nwdniAvntnYNtMBt1UXn4ah+LZ29m+ZCBfVRfro/AgQrUKRY8ijgwp209h3pGifXrL7pqGhzGFSnt UUsAvb5/IYCrLSS80JyDlBwUkZsSQO7YDf30TtrYSwdE7leaiG/2kwARd+eXqZNZNhVyiOiGrXtn4 9et+fSVLXLm9PRKY=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jPc8b-005qVe-4L for openvpn-devel@lists.sourceforge.net; Sat, 18 Apr 2020 01:19:19 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Sat, 18 Apr 2020 03:18:49 +0200 Message-Id: <20200418011849.382-1-a@unstable.cc> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: unstable.cc] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [5.148.176.60 listed in list.dnswl.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 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1jPc8b-005qVe-4L Subject: [Openvpn-devel] [PATCH] sitnl: fix failure reporting by keeping error negative 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: , Cc: Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox The err->errno value reported by netlink is already negative. Prepending ierr->errno with '-' when forwarding it to the caller results in a positive value and thus not detected as error. Fix error handling in sitnl by not negating the sign of the value returned by sitnl_send() in case of generic error. While at it, print the errno in decimal form along with its string represenation. Reported-by: Richard Bonhomme Signed-off-by: Antonio Quartulli Acked-by: Gert Doering --- src/openvpn/networking_sitnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openvpn/networking_sitnl.c b/src/openvpn/networking_sitnl.c index b93697e9..7adcb64c 100644 --- a/src/openvpn/networking_sitnl.c +++ b/src/openvpn/networking_sitnl.c @@ -365,9 +365,9 @@ sitnl_send(struct nlmsghdr *payload, pid_t peer, unsigned int groups, } else { - msg(M_WARN, "%s: rtnl: generic error: %s", - __func__, strerror(-err->error)); - ret = -err->error; + msg(M_WARN, "%s: rtnl: generic error (%d): %s", + __func__, err->error, strerror(-err->error)); + ret = err->error; } } goto out;