From nobody Tue Nov 25 13:50:20 2025 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 4dG3wr3blQz6JBKF for ; Tue, 25 Nov 2025 13:50:20 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dG3wr2FZyz3Kpt for ; Tue, 25 Nov 2025 13:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764078620; 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=i39LoQuRGqpak1061/0is9OovXZm1GAFpPNTEYAqlIE=; b=gmh4npYl8cruUvY3GgNrXzd/axht1LWQ6TfcdgsEkknFvfBqCAD+zKjeHypEvgm/EJxDde t8zVbmidZJW4hMwwqUJfSG3ZZD4b0OyU2Skjm/CNz3fkxZQe12cD3c85tDR52XKXnDQ3WV aoNiRNzYHgmWifLhHPJ/tONq8n+NolXgmIEhYjd82ZdbyV6WdeEqitgBQFCVXICsC/m5dk 4C6em/Yv5CcP37JgpROCDsL0MbPR0Owh9nqz1OEc20lP2naVLI0MPYdnSbPedYHhnslmbt fIp2SrQub0xbwHb6kuP3vWYw9BjWXUPiO4CXymRu/5mBPoDBAVISpNAxa89Ufw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764078620; 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=i39LoQuRGqpak1061/0is9OovXZm1GAFpPNTEYAqlIE=; b=NRam7XRG4aevyShywWjuKi0Tq9C1N/YymRQ5ZbsWh5mdqpT2yWNDfE3iiQq1lR2xS8zt28 zmSr8AAgyR28jpgDR7zUvDsLZBPsdO9hKm+1g7ULqf/P1gOdHqScjaebykhXdDUQN2y+XT aVMBRECJlH4MuyBalTtRrsLLIHyvXoKGs50nMQOFoilUwtkDL2KS6SymfdRHsgPCs5Y4qd KGirnrl98uSpuJylOIKaBXRlDRoMlZVj2G7co2iDGbxnPo0DqGa35S74t3aTjcIpBseJnq 7VPYRB3wk8OyUtm/ImIP7r+kP28K5b/qYEeBuw1BTWZ0Haxp78kimGEe22MzKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764078620; a=rsa-sha256; cv=none; b=P2LhqQVBcA3VuAUzS4IgdJb3s5uf870lmc4bzqgoxFf4e6H5GJDRsBn0MFpckEo4AEqnCt C6iTHjrNBkYtHzEd6usIWX+FQwghjcVE78izC5EUYJAPx5cocE5LVVzKHnu60pa+nigU9v nqc3SGkeNJdrrkpqycWGcP2Be/FFKjCZbAwQ65JzyTfy4oIVzSFNmJGD2YPlKWqC8Hs0O5 pry4M7bShUKV1ryGUFkKypNuQ5yXE9+q9JYEQWRtsayL8YjwdeVIS2SLJjhLGNixeqce9/ 91kU7HEdBFM68a8W03w3YVJ515kM5SNr346FFtQkChne6Nta8O3gZsZ8USZkOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dG3wr1msBz133G for ; Tue, 25 Nov 2025 13:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d192 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 13:50:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 238ad591da9e - main - libpfctl: improve error handling 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 238ad591da9eede122a708be925b6b6a20e9046b Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 13:50:20 +0000 Message-Id: <6925b41c.2d192.726c8765@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=238ad591da9eede122a708be925b6b6a20e9046b commit 238ad591da9eede122a708be925b6b6a20e9046b Author: Kristof Provost AuthorDate: 2025-11-25 13:48:29 +0000 Commit: Kristof Provost CommitDate: 2025-11-25 13:50:09 +0000 libpfctl: improve error handling If we fail to open /dev/pf don't try to close it again. That would result in errno getting overwritten by close(), hiding potentially useful information. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index e747763ae6ef..3db596d6fd38 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -76,7 +76,6 @@ pfctl_open(const char *pf_device) struct pfctl_handle *h; h = calloc(1, sizeof(struct pfctl_handle)); - h->fd = -1; h->fd = open(pf_device, O_RDWR); if (h->fd < 0) @@ -87,7 +86,8 @@ pfctl_open(const char *pf_device) return (h); error: - close(h->fd); + if (h->fd != -1) + close(h->fd); snl_free(&h->ss); free(h);