From nobody Mon Dec 13 13:50:34 2021 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 A47FD18D1926; Mon, 13 Dec 2021 13:50:34 +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 4JCNF62z9sz3Cbb; Mon, 13 Dec 2021 13:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 467EA15B25; Mon, 13 Dec 2021 13:50:34 +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 1BDDoYjJ035935; Mon, 13 Dec 2021 13:50:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDDoYYJ035934; Mon, 13 Dec 2021 13:50:34 GMT (envelope-from git) Date: Mon, 13 Dec 2021 13:50:34 GMT Message-Id: <202112131350.1BDDoYYJ035934@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: 9a663b668c05 - stable/13 - pfsync: NULL check sc before using it 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a663b668c05ceca0d5bc99665166e11b00c3420 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639403434; 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=K5R+chIPQalWTIHt9R7Q0757Fw8K39nVyL7ypag8WqQ=; b=G1fBR7aIi2SyIwKRnAVVidK/o6jZjndcHkgITlS7CFfXXQ+hI+NHN5cUo5XdLIDS8SvWrR LTY74qRS1QXkWSsdC5GTwa+DWyatJ6nwYS6vVMPn/d8EBeI3haUmNXaC6fuXY1tq6vqueP KBOhm1yEzqDDDdbCPfTX3TY7nubQjpuCZmawYcmcqqDM8nTF7yGLMXokEqcGvc04I9aAyx EfczwdWsHd4Xc2PEmRXZuR7O0wClFQcOy6HozTht64Ub5m8+IpNyjn+ydFXprgCOgQ8F9s PlhGjS9QxXvUNWq5m7YneY+fJH9OLlqOPsGdGADG2FPm2z2eayF+qWGwkGDUbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639403434; a=rsa-sha256; cv=none; b=DAhLPCec73vW7ioncvnfQoN0cksFduuSAR9x5CYs0xHRXUTkKBhWbG9VUtnE3j5c2LuZyL uXo7hdAkwTSkU9vn1Id6RHBRaFMddkew32IfeHawItk0PS+drP70DoQ48FEWHX53069AWf PEoIVTgWoBCDKYRcf55PxQrprZOv4/rJIsoWtQOH7mHNt4pYd8upnK0BGzyC8o25aRmzrH hzEW8MTnmqHz0S/JfXd2zVcImhiL5ruC05+Of8hh/4zwmVSlEpLTaxPRZp5xDgbXIK6AJA 0MdXkZkg0tPJOsSnk7JNYzJfQTFPqQ7dtKUFtBLOby2rWtm+oMoFIGR1sq2hFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a663b668c05ceca0d5bc99665166e11b00c3420 commit 9a663b668c05ceca0d5bc99665166e11b00c3420 Author: Kristof Provost AuthorDate: 2021-12-02 13:32:21 +0000 Commit: Kristof Provost CommitDate: 2021-12-13 13:49:27 +0000 pfsync: NULL check sc before using it In pfsync_defer() we must wait to lock sc until we've ensured it's not NULL. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D33240 (cherry picked from commit 27bd812c5c92af9e7acdbf100bd98166a717bb76) --- sys/netpfil/pf/if_pfsync.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 7208444d65d7..9b760f63e134 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1739,9 +1739,12 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) if (m->m_flags & (M_BCAST|M_MCAST)) return (0); + if (sc == NULL) + return (0); + PFSYNC_LOCK(sc); - if (sc == NULL || !(sc->sc_ifp->if_flags & IFF_DRV_RUNNING) || + if (!(sc->sc_ifp->if_flags & IFF_DRV_RUNNING) || !(sc->sc_flags & PFSYNCF_DEFER)) { PFSYNC_UNLOCK(sc); return (0);