From nobody Wed Mar 30 09:17:23 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F2A5B1A34BA2; Wed, 30 Mar 2022 09:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KT16W40Plz3GFj; Wed, 30 Mar 2022 09:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648631843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNfzJuxIwFtleZaY1XfwiQ983i600eqbQyjuQBfl3d0=; b=kDeGTndLyQruDmjjBFNrDZ4IdmC6iOgKyLuZEmkEAtWYIJUnZiCqNqxBbmfG979UjUIjJ/ 464EmqnAWKNRn9aj7CLbQ5PGuMvzU9R+L+vqYKiNhyr7hakUvSKn2pdZgNKylyOW9vMabt 1XH3PGo5VRBvg8ql+7v7pbTO1MJiLoI4hIRwYEKFXsopTTheGVdEaZBOwgv6B76H7wTYcP fTpsx0TiBKja9Vr2xQsN6t12ImO1rAe9ELee4D4JMcUufEbatBykPbzjkF2YCDBO6hUPD9 Vv1RRHi2N6pIOLDqj2AzxGeoXEXaOJINcAyRZt0hcWyH8zjmpcYGnz9YqVSQsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5E1921090C; Wed, 30 Mar 2022 09:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22U9HNXf091001; Wed, 30 Mar 2022 09:17:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22U9HNeI091000; Wed, 30 Mar 2022 09:17:23 GMT (envelope-from git) Date: Wed, 30 Mar 2022 09:17:23 GMT Message-Id: <202203300917.22U9HNeI091000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 514039bb9085 - main - libpfct: Return errno from pfctl_add_eth_rule() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 514039bb90853473078acd2fbba1b1bfb359aab5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648631843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eNfzJuxIwFtleZaY1XfwiQ983i600eqbQyjuQBfl3d0=; b=pVdwTk4VBYiNdyIuk9ve7Ra9M8P3YsJvx/RDTpwEospVD/8EyleHQJftYTdzO/5hxkGbGB FqRGOOWpgJjBYNXRyOQLOw6bhtMW+SXv49hmBIteF6r3ONhEdz+kEJbODeLPIMO8EmgyMp FA9C2zEEGRMdRTkLGtfrSluNa3ObBvTy6ezPlG+HF0Q9IffZpO1JLl5hHaBYq5c4NPd8ta R/ouWZGe6I8YNBiSZ5aTGDXOUYYFVncyKh9RwNnEL3rBTiymI1asoD1LKH5Txpa2cfMsZv BQRNrhGafEEulhFIyFluiv026g8lUPlS9ni8xP/0lwJdpzocr+S7YAaLqy4noQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648631843; a=rsa-sha256; cv=none; b=QTVgg0ys2ZRFtuf/YLKWu0euQN0lKNFFVefA0CNMJvQNAbJc/XO+Bcw55ptI/bWFHgAbJt 5Otqu0ePr5xavC8QSpHefTCG8tuN5RRJBeSkvdBeGBu9h9r02NP+x1KLDS+drWLOUSu9UM gjQwZ6G4Se3LrE1g8FvJEvupK1WBj7rME2bIcCTbnrdTF7F0hltgaAyxHKVf1/GxZcU51F 5CG4vAapZFviKQ9nsEh1ogHV/nnhpeXJSb70tAPOKs0q9yCm2XKPczqWSBsOC5+tebmL3M visFHSHSMBRdIYzwI+Dei79aN3dVQlqrLyUoeJwMKKqje51eYTNhi7GSoewZYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=514039bb90853473078acd2fbba1b1bfb359aab5 commit 514039bb90853473078acd2fbba1b1bfb359aab5 Author: Kristof Provost AuthorDate: 2022-03-29 12:15:47 +0000 Commit: Kristof Provost CommitDate: 2022-03-30 08:28:19 +0000 libpfct: Return errno from pfctl_add_eth_rule() If the pfctl_add_eth_rule() ioctl fails return the errno, not the error returned by ioctl(). That will give us slightly more insight into what went wrong, because ioctl() would always return -1. Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 1e1a90594210..8696ef1ace25 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -786,7 +786,7 @@ pfctl_add_eth_rule(int dev, const struct pfctl_eth_rule *r, const char *anchor, struct pfioc_nv nv; nvlist_t *nvl, *addr; void *packed; - int error; + int error = 0; size_t size; nvl = nvlist_create(0); @@ -838,7 +838,8 @@ pfctl_add_eth_rule(int dev, const struct pfctl_eth_rule *r, const char *anchor, nv.size = size; nv.data = packed; - error = ioctl(dev, DIOCADDETHRULE, &nv); + if (ioctl(dev, DIOCADDETHRULE, &nv) != 0) + error = errno; free(packed); nvlist_destroy(nvl);