From nobody Mon Mar 20 16:39:30 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 4PgL6p4P7Wz3ywwP; Mon, 20 Mar 2023 16:39:30 +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 4PgL6p3tWlz49nW; Mon, 20 Mar 2023 16:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679330370; 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=Uf5iib3rptElcc1vAQOfJ1bALRquMjLRGO3GwOjAQ/w=; b=iW+/jc/GRrO0Ym/erDEUSA3NxA1w0OhcVB2wDN5BjgTE4NrMwMB06n4wnDCdhhiZuLv+v4 h76luTuCNV3boh3WFzkP8g8G/szejWohxjxbpRlJbVjWS4HP7xDOpCZj0Nk8CRRHC7d/5Y gevG9LTfDcIuMH0y2ivM014QDSSypKkGSjorP/99cfUGrQ8lbQB1ADFhazc7yhNs8oPSWL YZM3nvyfn6D0h0KNHb2DlimyeyeeWFeqyYUaXnkeOTI5/zH1TtwXUtyfsg/9ih3dFFN6gs VOY9TCmE+KLvHtke1dxPdps+cUbB+hutIdUuiPp0EWkVwQ+AwXI2hDsRbBChpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679330370; 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=Uf5iib3rptElcc1vAQOfJ1bALRquMjLRGO3GwOjAQ/w=; b=JREpDVHBTO0LUm8j+Ack2kRat1i6TtRWtvUMq7XbYnvNL6rrII7FibFvxI0U8p615j+U6v MrPYVE7HS54vL75FLp402xp6ha1ZqBDimlKBgxINXbmjXU+BTuZK/pvlfJ3FoaqZSzliHD bX/xpgqBPliUN808W8sXGtSepEej83/0SYvHryNOw91xWyGt6QsFdXVa3E5fu4m8mhKtIo 0WPrIeK7VJrR99VZJbi1qibCV95PWZj8Th9kq4H5zclvcwJavRAHJS9Hin6Li97D58LXwV Lzanh7gpewFYuc2CHXWEimW1Vbe74vYrVNNdrehLt38gRFN1XhjsKhVYRE6Rxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679330370; a=rsa-sha256; cv=none; b=Ds09afuw38CywqiN5LLwxU5GAY7H7yICt/Cy5+kVIBlG7DJCnoogOW3a+lOX2zUkugC0ur TsQmqJN1L7kuegJuDlMrcqoHS8QOOEJeuBpgoE4Ovp7xM0xREAoomzsiro/7BKe3+AEgI1 f/IUD92PIFmnVm5QL/oQewzUNzwMEPXp4t514bvBoSL1o9MreAUUKqatRmx8/0DDgSl7Nm +4b9ao/egL34zQ2lS2jV+KBpovM2vR7aXEDwJrQFLNzDVpv4CoPpUs25uSDQo89bCWDxug L/TAMOh7MpRTPMxD1ZCmqYtVjJYgXCPxUN3Mwc/n6PIXuv8VeM0y62mgI+FR1w== 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 4PgL6p2xZ7zcXD; Mon, 20 Mar 2023 16:39:30 +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 32KGdUch071188; Mon, 20 Mar 2023 16:39:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KGdUXv071187; Mon, 20 Mar 2023 16:39:30 GMT (envelope-from git) Date: Mon, 20 Mar 2023 16:39:30 GMT Message-Id: <202303201639.32KGdUXv071187@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: 844ad2828a35 - main - pfsync: add missing unlock in pfsync_defer_tmo() 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/main X-Git-Reftype: branch X-Git-Commit: 844ad2828a35c434b893af4274b1f6c50332dd70 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=844ad2828a35c434b893af4274b1f6c50332dd70 commit 844ad2828a35c434b893af4274b1f6c50332dd70 Author: Kristof Provost AuthorDate: 2023-03-20 13:26:33 +0000 Commit: Kristof Provost CommitDate: 2023-03-20 15:39:14 +0000 pfsync: add missing unlock in pfsync_defer_tmo() The callout for pfsync_defer_tmo() is created with CALLOUT_RETURNUNLOCKED, because while the callout framework takes care of taking the lock we want to run a few operations outside of the lock, so we unlock ourselves. However, if `sc->sc_sync_if == NULL` we return without releasing the lock, and leak the lock, causing later deadlocks. Ensure we always release the bucket lock when we exit pfsync_defer_tmo() PR: 268246 MFC after: 1 week Sponsored by: Rubicon Communications, LLC (Netgate) --- sys/netpfil/pf/if_pfsync.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index f1130ba143f1..4c834c7f0315 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1827,8 +1827,10 @@ pfsync_defer_tmo(void *arg) PFSYNC_BUCKET_LOCK_ASSERT(b); - if (sc->sc_sync_if == NULL) + if (sc->sc_sync_if == NULL) { + PFSYNC_BUCKET_UNLOCK(b); return; + } NET_EPOCH_ENTER(et); CURVNET_SET(sc->sc_sync_if->if_vnet);