From nobody Thu May 16 12:02:42 2024 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 4Vg7yB2XLVz5L8Jb; Thu, 16 May 2024 12:02:42 +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 4Vg7yB1ltTz4kQm; Thu, 16 May 2024 12:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715860962; 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=keywcwpjL4kZjUsDQFYE9SACiPcEne8PvGlM4skA6w4=; b=E5cJQfwvrTBV2MmRwZzT3SeBPy6imMxVGHpOZI6JIAspCpiClVMBZb/yVCFkBHzh7AhU+p lb4QVwLXwV6EGaTnO5/mvtaLEsjy5Ifpn/yEXCAj3sZys5NCXsCfyt3jeqYa33gx5pZsOH ha0e4ijmUNEKTY58V+98IKyqOwRHmzGMk17b+H5uKoAEkn5URW7HtBOzO60nmA0ATF1Xhd Qfj3Ljb7sgAwmMLo4diD/T90At7rFRcNtC9S26gm/RgnGSD3FaC1Rk155gjR66Zu6AMz87 cQsBCtQsWSlNgpRlTkmpFPOSoOxyptB3IBGSGaR7XuBFvSM1uzdJggUPjXF2vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715860962; a=rsa-sha256; cv=none; b=K2JBzB+NFH64umi800Ku2eVJ1vSAEbtAoeliop0seBiAk0TLiEnoQ3x5u+YVODoSWepgeB A7eXXUeMoaqTIxJiskU0P1AVcOra789BBiG6R31ioBDucQdmMyLbqtu/hKKckIdm+0BLKA Kuc8CJusDDop51W6ve2DvDRcBeWrr0uA/n5ZwaNCXTM8sbIjshL9uDrZl9Hyvrnab2/sOg 31odiRGLLcron5GRoFQ2o/mnXOHiR/o2cm0LGsLNc1cBL2uh52D9DFvHKqBuVz6jETQjpe BtkzBAgmTDwGl2JSQIer8Py+O7c0tSa/qNdwaiMClMHCz59FwGzd9VV+jhvjZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715860962; 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=keywcwpjL4kZjUsDQFYE9SACiPcEne8PvGlM4skA6w4=; b=fvTC25FkwsrK/W8O0VffrLTPslqlEE4Pi896oy5BCyq2L7L0W9x5uwswB4iyXuR/o9s7DW jWcg5Uh13vD+CMScWrR3x/I9zm5eg+q+Uw7p0KhULNEILRS5Gd8IcCfny+GREkLjgP4QP0 2oiQXermnxiDt9sUus5AX0hAy0seNj5YZwYajZuUeOnhi9n1CFqvtBGFSeeNdHMFZcUqWz PWW+W3vr49+GgIeTCcqKOkWJU+jxmbFBzYsBdsYE18qFElA9tnxoQd+jsZAiIvlhQyZOLj lVGemw2dVbLKf8Tc/DUHSNBoykg9fqQTgZE/dwXu2puMtsbjPK1lvd2yZybxEQ== 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 4Vg7yB1LM0zyKN; Thu, 16 May 2024 12:02:42 +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 44GC2gQ8011971; Thu, 16 May 2024 12:02:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GC2gxw011968; Thu, 16 May 2024 12:02:42 GMT (envelope-from git) Date: Thu, 16 May 2024 12:02:42 GMT Message-Id: <202405161202.44GC2gxw011968@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: b9f6b6685558 - stable/13 - pf: always mark states as unlinked before detaching them 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b9f6b668555849a8d6d322b803264404d65615cd Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f6b668555849a8d6d322b803264404d65615cd commit b9f6b668555849a8d6d322b803264404d65615cd Author: Kristof Provost AuthorDate: 2024-05-06 07:43:49 +0000 Commit: Kristof Provost CommitDate: 2024-05-16 07:40:35 +0000 pf: always mark states as unlinked before detaching them Users have reported crashes in pf_test_state_udp() where at least one state key is NULL. That suggests that pf_detach_state() ran concurrently with pf_test_state_udp(). pf_test_state_udp() holds the state lock (aka the id lock), but pf_detach_state() does not. The intent is that detached states are not returned by STATE_LOOKUP/ pf_find_state(), as the state's timeout is set to PFTM_UNLINKED and thus pf_find_state() does not find the state. There are other paths to pf_detach_state() (outside of pf_unlink_state()) though, where we did not set the timeout to PFTM_UNLINKED. Fix those, and assert that the timeout is set correctly when we enter pf_detach_state(). MFC after: 1 week See also: https://redmine.pfsense.org/issues/15413 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D45101 (cherry picked from commit 301ec2cebb6a3e472af39eb7b98c3b7ff88e04b0) --- sys/netpfil/pf/pf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 1fd5803117bd..2c171514e946 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1283,6 +1283,7 @@ keyattach: sk : NULL); printf("\n"); } + s->timeout = PFTM_UNLINKED; PF_HASHROW_UNLOCK(ih); KEYS_UNLOCK(); uma_zfree(V_pf_state_key_z, sk); @@ -1350,6 +1351,8 @@ pf_detach_state(struct pf_kstate *s) struct pf_state_key *sks = s->key[PF_SK_STACK]; struct pf_keyhash *kh; + MPASS(s->timeout >= PFTM_MAX); + pf_sctp_multihome_detach_addr(s); if (sks != NULL) { @@ -1478,6 +1481,7 @@ pf_state_insert(struct pfi_kkif *kif, struct pfi_kkif *orig_kif, break; if (cur != NULL) { + s->timeout = PFTM_UNLINKED; PF_HASHROW_UNLOCK(ih); if (V_pf_status.debug >= PF_DEBUG_MISC) { printf("pf: state ID collision: "