From nobody Wed May 11 00:01:24 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 4AB451ADFF79; Wed, 11 May 2022 00:01:25 +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 4KyZnd1Q5Nz4kvR; Wed, 11 May 2022 00:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652227285; 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=myTzgVPZt0ZhQR+iRjhMhg+xd83gGaZa8a5AL+SVZ60=; b=U7LdnRJnxwq+/hW0vLJ3rVvXfB/zRLhQCdHYBgBUUVLS8i1cIuBO7pa1/pXS9CCrlQLIM1 +drftseKfV1cWDIdFnA1JCOMzrIBy14XUOm4TqTFBj+L4e6WvCeNLeL+GDTWF9KxLZmXmu Fq85fHnAgMjZYamr2AgTuvXf9N1ZTHQwkZyRMF61JC6xBlgs8ao/B1Xn0cNkIxVG+wzWtP 4Bwk1Wct8mSOxjPCGnv6sVcBLsIfHV4rHQZueIP5iorvOaZuuE+YoSvD4g8FBZls5ajzXp bMEOIVuUC99lzuX5A6Q2O41WaemcLGWWnhRtIkSDShIHuMp6V1jiFsBUzOcLnQ== 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 112AD72CD; Wed, 11 May 2022 00:01:25 +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 24B01ORS022510; Wed, 11 May 2022 00:01:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24B01Ori022509; Wed, 11 May 2022 00:01:24 GMT (envelope-from git) Date: Wed, 11 May 2022 00:01:24 GMT Message-Id: <202205110001.24B01Ori022509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 826c58d6656c - main - pf: add missing unlock on error in DIOCCHANGERULE 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 826c58d6656c62929af2d705a428921cfdfcb3ab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652227285; 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=myTzgVPZt0ZhQR+iRjhMhg+xd83gGaZa8a5AL+SVZ60=; b=uc9V7iZss9bl9bk3xd5vA2xN/2vxW27smkQhQHd652FgNb9hZ4eoNiop8uBO0a0bL9pNRa riKonDiVFbXSFvfx9m+39KRQ8YsgY554xdV5wl3wwYAB+YllmdWw4Kv4UPZQ/Nh5fVKM14 LygZLRvnt02Lu2Dcyd8cYRDJoe7PE24+IEt2UiqMn2g/+AhITA7V5SOqiJnjaQG6cYXt2J CyjlxUVJ2E6FKOEvYfwHpSetEuJfF6yOZ8BXQqzkhLr5h54Rdc+H1JXHboRwp1Qc7xcP6e A9FiH1k01hiib89BtAbsiWDtMTovAzN7dvki+ID97zx0h71hisLCXWeYuhr9aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652227285; a=rsa-sha256; cv=none; b=KHF1rzwvgpHjcx03V65cakv6r2o6x14Mee0P7R3iMBmzJoM51qqRjgOfnD/sZVcOVnsJl9 TXsn/f0UWjA1169Ox/AKrE1c0OA9oSpjjjVIWDTKYe7+Do2kUNMVDDbK4r5w5TAQVJfHJY o4FfdDAclBMUDIoIoiJWoL1HjFIAy1CN87s14boxP1JC5IpmbDvWOWHJT8o/6eJ4EAoxso fbHJKclLd0KtmnC/T//509mXnb4R4/KiDBVhZ+iQtcWzSArImg+/sPP0ejDNwcu6u94fuI R0Jc3ALw9FvgJahJS1po4hgASEzE55DIY/GXAg5F0B+WEz60nzcaam0kRWY96w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=826c58d6656c62929af2d705a428921cfdfcb3ab commit 826c58d6656c62929af2d705a428921cfdfcb3ab Author: Mateusz Guzik AuthorDate: 2022-05-11 00:00:17 +0000 Commit: Mateusz Guzik CommitDate: 2022-05-11 00:00:17 +0000 pf: add missing unlock on error in DIOCCHANGERULE Fixes: ff80dd034a8ca732 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 6b8d63b8bdce..8c3b9a423af1 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -3618,6 +3618,7 @@ DIOCGETRULENV_error: #undef ERROUT DIOCCHANGERULE_error: PF_RULES_WUNLOCK(); + PF_CONFIG_UNLOCK(); pf_krule_free(newrule); pf_kkif_free(kif); break;