From nobody Fri Feb 3 09:39:54 2023 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 4P7VxQ3fTzz2nPrT; Fri, 3 Feb 2023 09:39:54 +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 4P7VxQ3D7lz3GWf; Fri, 3 Feb 2023 09:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675417194; 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=/Fp8SBJ1w/sCzGKxplNhWXgxu9ISmQ3H4bWgX01Rcfg=; b=wjCYMd4YpX6z8I/AJM4KAa5ZC2Hy4TOHPLOMHDKRDSR4GZgiOnVS2BXdsvrQjDcBC6Nbxq JL4TfktoLMLBNBfDjWR0BM/ToATkutyTb6lYTSVQnCNOA1wiGVSxmR3zvHkv7+geW5tQ7e tqkzPEiz5CR8shlpVBYu/p/8nCy8tJLxNK0iLKuSb4Icaia+iKq5XMyRhqj+Nt+dJH+n61 Alo61lgXXAdUGWewuEvyQRm6vvx8xnIuWAwzwnkqh77vq16CxW08v/sTOBPsPLMpXtJEjH C2JbzjVcjngCQiIUPDh+exwlhpmYOyqlqbbvxPjrGRoiDyl0oWJuZj86ic+Log== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675417194; 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=/Fp8SBJ1w/sCzGKxplNhWXgxu9ISmQ3H4bWgX01Rcfg=; b=TKTAu5JiztL2LpgWUfbxy7p3waUHn3A6ihwHt0MvyZLS+rWTtdKbqP0lkysw/niNGP/lml UGolJZb/g4C1pPRLCDBuemraWo2ikulSlwlLR8rDFC8HTx/WzfNKk7i4AFue8xHlNkPZeR pKAzyn1JzYGL5Odb11U8A2iH+6i/Lw+uGijXRJR5fmplqVM6RVk7IlnrQkfEGv0dnLS6kP rfo3L139Mg1Ov1fjDx8tDajZSepRmfpidwkqjggjfGKUnVEqI++saWqVm+rnsZYUUQ2y+u uQMXYP4sBy/VTeQ6Z6E8qAWTz9bq+JKjLUAo6eDwDYPyGbY0rndbK5OSV+o5NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675417194; a=rsa-sha256; cv=none; b=XpXZSRb4uXRVxlrsV/iHRZCvJTDR6cSBZ0SIPD/eFJsgi3JhSWcoIvf0TA+fM4O/JcozW3 xpXxVyd/PLhu2A98GaMowy4Dm25hjh5GVijkXltJhx6oCpYhmpVY421AUPnnwSCXFlJkop V7EbPw+M1rgw6IgPsAWG4uqsjIATfMDhXS8GHGI3hqzbYoLYrOsp24uXY2LZXEmsHkzn++ 20Q3Ft9HFyvoYQnwTL60S28sifcv+LvZl1hT8wK5lTOlNoamG420i97YCx9Im20MU7Q+wG s2asO7zDDE65sd+3rE2V+sOuFG2dpGJQ/T1qBqpfWFP6/h5ftGuNRuaS2hmN+A== 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 4P7VxQ2BXtzVFH; Fri, 3 Feb 2023 09:39:54 +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 3139dsQZ087434; Fri, 3 Feb 2023 09:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3139dsOq087433; Fri, 3 Feb 2023 09:39:54 GMT (envelope-from git) Date: Fri, 3 Feb 2023 09:39:54 GMT Message-Id: <202302030939.3139dsOq087433@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: 0ed5f66c5ad2 - main - pfsync: add missing bucket lock 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ed5f66c5ad23a6fe02d60765acf5e5e00957542 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0ed5f66c5ad23a6fe02d60765acf5e5e00957542 commit 0ed5f66c5ad23a6fe02d60765acf5e5e00957542 Author: Kristof Provost AuthorDate: 2023-02-02 09:34:57 +0000 Commit: Kristof Provost CommitDate: 2023-02-03 08:39:09 +0000 pfsync: add missing bucket lock pfsync_q_ins() expects us to hold the bucket lock, but when we enter it from pfsync_state_import() we don't. MFC after: 2 weeks --- sys/netpfil/pf/if_pfsync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 3aa9bbfb633f..2301dc475e27 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -605,7 +605,11 @@ pfsync_state_import(struct pfsync_state *sp, int flags) if (!(flags & PFSYNC_SI_IOCTL)) { st->state_flags &= ~PFSTATE_NOSYNC; if (st->state_flags & PFSTATE_ACK) { + struct pfsync_bucket *b = pfsync_get_bucket(sc, st); + PFSYNC_BUCKET_LOCK(b); pfsync_q_ins(st, PFSYNC_S_IACK, true); + PFSYNC_BUCKET_UNLOCK(b); + pfsync_push_all(sc); } }