From nobody Fri Nov 24 14:10:46 2023 X-Original-To: dev-commits-src-all@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 4ScH2G4bNzz52b1j; Fri, 24 Nov 2023 14:10:46 +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 4ScH2G3ff0z3ffR; Fri, 24 Nov 2023 14:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700835046; 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=MeQqgSrQpuJyxW6HY4AiOB6quG2gImi6xESWmQBeyk4=; b=WiR6TdRquy7zO0umRX673y2BW113fvSHzxAYG7FqLD4FXfpTL+QLU+38lGxvVLvNrR5OwO v1EMnSfPMSwAm4U+VvIG0Yg9soDKCqF4dQpJDWm92kx3jtwLYds3hcXD5/4vqaIjJKSGj1 /O7WIzWee2pUpj2EEF9thEyXpvf3X2dn3IB8Pn3lrUIiyXVzBQRPp48Cb1DtUydBOFkugh b1mTkc9rnjOl1jdy/V4FKWwgsckT8jBLmPwBMu+huYULgVkTRbw+TR+2cg9Rw321WOY4IG +R5tn3CPxdaZocPG4mJlfI5d/qwTTRyZhH56Mih133AB0ODogiLlvbFGB7Xb7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700835046; 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=MeQqgSrQpuJyxW6HY4AiOB6quG2gImi6xESWmQBeyk4=; b=ubH772EKr5Q5tEEidkLdFsOTPYtvY7EtDlzYjvlW7ZNt1xmdNu5i93Y4nMJDUQD2Ka4wLi ds+4/UfAHXXLjUAkXMvipbWbFi+CPFdiCko4jFrbISoHEGmtqep5uaBNu+omQu/aWNchfu R+W1/5epC6YW/dAXgm/QzkAnx3gDFdP4o9iUk16a7GHG+TdMJE2ezvS2/XGy5V28cAh4Ys fuUUH2/I6rIqlgvThgn0TVjCPYMFuVgt5n2eISP28WBN2RoIn0w+hvh/W3pchido61e+Lq hFHFN14nPJai9ASeZBxybrlXfoaZDp8O9mt268jkUwcp9GMrzP05JMPsfW3uzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700835046; a=rsa-sha256; cv=none; b=JL1UIWsTwPgxhQZ/fG1deUbXDSMfTRPOXkxPU9++9eXVCCVEuzOJC6C+B2/UQtc3QbZtGT VG0BOahkePcASjOTdC8ZhMLnw5wnAGhDSXY3m+KjKX6vgziimWQTEH2C/vS92aydWpjm1o RCfujIB5yfnsAW49aWuheVW3oNv6sa4H2eZ/j2dsV7xhF2wLulxHQWGQRGYESAlovFO/L5 B7lVzt5kueV1Trm8MP81/rGAck1J1tWxJclCzLu/vPUApsbjGyaHqnrtq2X752jMZEfWX6 U0CYiT8SkWA53TX2D7iFF8fql66ScebUxfaZ+fjNStVhSzrmZQQyQpywrKkIGg== 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 4ScH2G2hpYznk6; Fri, 24 Nov 2023 14:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AOEAkcr024949; Fri, 24 Nov 2023 14:10:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AOEAkWI024946; Fri, 24 Nov 2023 14:10:46 GMT (envelope-from git) Date: Fri, 24 Nov 2023 14:10:46 GMT Message-Id: <202311241410.3AOEAkWI024946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: df4feb98df2a - stable/13 - libpfctl: handle pfctl_do_ioctl() failures better List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: df4feb98df2a2887c05798d9f8752953777d1564 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=df4feb98df2a2887c05798d9f8752953777d1564 commit df4feb98df2a2887c05798d9f8752953777d1564 Author: Kristof Provost AuthorDate: 2023-11-17 09:19:38 +0000 Commit: Kristof Provost CommitDate: 2023-11-24 09:19:39 +0000 libpfctl: handle pfctl_do_ioctl() failures better Ensure that we free nvlists and other allocations if pfctl_do_ioctl() fails. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 498934c5ff51e6b0d3199db5d27ed11b1e8b9582) --- lib/libpfctl/libpfctl.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index e5675f2a232b..be45746368de 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -221,6 +221,7 @@ pfctl_get_status(int dev) nvl = nvlist_create(0); if (pfctl_do_ioctl(dev, DIOCGETSTATUSNV, 4096, &nvl)) { + nvlist_destroy(nvl); free(status); return (NULL); } @@ -792,7 +793,7 @@ int pfctl_get_clear_rule(int dev, uint32_t nr, uint32_t ticket, nvlist_add_bool(nvl, "clear_counter", true); if ((ret = pfctl_do_ioctl(dev, DIOCGETRULENV, 8192, &nvl)) != 0) - return (ret); + goto out; pf_nvrule_to_rule(nvlist_get_nvlist(nvl, "rule"), rule); @@ -800,9 +801,9 @@ int pfctl_get_clear_rule(int dev, uint32_t nr, uint32_t ticket, strlcpy(anchor_call, nvlist_get_string(nvl, "anchor_call"), MAXPATHLEN); +out: nvlist_destroy(nvl); - - return (0); + return (ret); } int @@ -985,13 +986,13 @@ _pfctl_clear_states(int dev, const struct pfctl_kill *kill, nvlist_add_bool(nvl, "kill_match", kill->kill_match); if ((ret = pfctl_do_ioctl(dev, ioctlval, 1024, &nvl)) != 0) - return (ret); + goto out; if (killed) *killed = nvlist_get_number(nvl, "killed"); +out: nvlist_destroy(nvl); - return (ret); } @@ -1135,8 +1136,10 @@ pfctl_get_syncookies(int dev, struct pfctl_syncookies *s) nvl = nvlist_create(0); - if ((ret = pfctl_do_ioctl(dev, DIOCGETSYNCOOKIES, 256, &nvl)) != 0) - return (errno); + if ((ret = pfctl_do_ioctl(dev, DIOCGETSYNCOOKIES, 256, &nvl)) != 0) { + ret = errno; + goto out; + } enabled = nvlist_get_bool(nvl, "enabled"); adaptive = nvlist_get_bool(nvl, "adaptive"); @@ -1154,9 +1157,9 @@ pfctl_get_syncookies(int dev, struct pfctl_syncookies *s) s->lowwater = nvlist_get_number(nvl, "lowwater") * 100 / state_limit; s->halfopen_states = nvlist_get_number(nvl, "halfopen_states"); +out: nvlist_destroy(nvl); - - return (0); + return (ret); } int