From nobody Mon Mar 27 08:16:38 2023 X-Original-To: dev-commits-src-branches@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 4PlQdL40zGz41x9Z; Mon, 27 Mar 2023 08:16:38 +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 4PlQdL3Qhfz4Brt; Mon, 27 Mar 2023 08:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904998; 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=sA2sY7GsSaWealMpi5nDyGiohbzl5K1CZLzmDfmWslo=; b=nCVvqeLfbywNRxSNVUXa24V7JEZ28f6nY2xlp0EbAWE5Zp4/HP+TkNGbQDcyi8onyRiVFH MBuce7OVmO24nPcV3Ebaabl0VZMHfPMwyzSGACfm/rRcg4yk5dvJ63s8CRy5GiOTmt3jz7 xYxWuw1aD+bOKpCi+DRaqiyCZXyq/qoXjreJOUUWoWi90ne7jtpYTFlJ7HifJbKLLPTMVh i8ynzlPi1hP8xRQBDrKWbMUsGgLiZ5OGJRjQ2+k5tKL2DLVJw2mYRg6hRyLnfYh1VRQp/G BjTNcSvCZVhINTbJiUity3Uelhn6lSe3C/6XPUxE5GA28MFZlDkS4SYoJPmChA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679904998; 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=sA2sY7GsSaWealMpi5nDyGiohbzl5K1CZLzmDfmWslo=; b=HY77UmdIccQpMFo4uUUU5FzOXyMRC3Y5EjSjQvZjOV+ZSIIaEbEJsPr8F4mLj3jS+MgbNz nUeSeFqxDbfFrGMqfsMph9+9zaiOa1aFDJeMXZRJNlX5ksNLKeqSOVhpEmtiHTsP0NwV4h S4kMcyTNBYyfh/IiQzf0h831YB4RpQppnNbHf0ASluEPT9ZvhnekswitjhD0huNYbrFCpG CFATd3bgAOwj0EtfqBF8W3Of6+STUSRzzoUD0Z+IravT2UGnwaSEK0KBIswZA9btFc69mE mvsnuoWbe++5U8KXO2d0FLXyyen1FDNmR+T1amdUqCmYm5TkUUm0ePniAayZ4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679904998; a=rsa-sha256; cv=none; b=CjFTRJ/kLKCodSEH2A/pHK7kBLxroAl721fmJn8JSf5VdRXpZauFMx4vyFUqA1o6y5/x1Y S6Q/px/47dbIaMjffUwN4U5avkHfhOwxkCEtsl74LGz0XKUMWilwqy2jUnT1t1Ed4niWwd AfjwTt8vxLDB9dhHEpKipT4YNNZeZRIDJCPy5gjKiSsUTo1Wg4rZuFGXGvmnarg0emJoft Cta05aY5lMM3gc0P+tX/C5XqzdI3aWvBOhV8FOgOQth38Tsxq4eR1225z3yGqrK4xBQH3M yGgiE9fvI8ARmRfM1RZEawH8luXHQ1QruAu4WekA2GNvOndT7yq0/kKLtofk1w== 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 4PlQdL2WyfzFQZ; Mon, 27 Mar 2023 08:16:38 +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 32R8GcBY045657; Mon, 27 Mar 2023 08:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32R8Gc26045656; Mon, 27 Mar 2023 08:16:38 GMT (envelope-from git) Date: Mon, 27 Mar 2023 08:16:38 GMT Message-Id: <202303270816.32R8Gc26045656@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: 1d6ece4351a0 - stable/12 - pfsync: add missing unlock in pfsync_defer_tmo() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 1d6ece4351a01179e3a5ebbdb3fa2e6053a2d7aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d6ece4351a01179e3a5ebbdb3fa2e6053a2d7aa commit 1d6ece4351a01179e3a5ebbdb3fa2e6053a2d7aa Author: Kristof Provost AuthorDate: 2023-03-20 13:26:33 +0000 Commit: Kristof Provost CommitDate: 2023-03-27 00:28:37 +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) (cherry picked from commit 844ad2828a35c434b893af4274b1f6c50332dd70) --- 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 6a67b8fe3d80..a73b4ff95c6a 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1831,8 +1831,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; + } CURVNET_SET(sc->sc_sync_if->if_vnet);