From nobody Thu Apr 21 16:16:27 2022 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 39FBA11D20C8; Thu, 21 Apr 2022 16:16:28 +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 4KkjMv6xdmz3kpW; Thu, 21 Apr 2022 16:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650557788; 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=+UWtTW4T8rj+W+5aw+OQ+h9L88RTntSix0aSW48PCP0=; b=uTB/iL9maKYFMUKnFZ0UqcxXy6xZRRL9Idw15KZHbubFQkGG01n375Ef4GtofVwZ3XXhvU PTDAWxwslxrSgaVQOm3zzytciU5Xf3uCM6M7PBSu1PtYDlA1uIpKAOb7mf6Yj8FdEeOdJW hTZ4bATFbTVNbcuhlijdrHJEKG+2qWF1EmaGMa11rCIZrAhA1GLD3BPkHh5IJsK5Q28MMj uz+Te79Ebhd9ChIwD7IEqIzie1aSkHKlTv6UtvByEffAMmmU34iRCy8+XX1F6xJNZKtcDB dPAkOTy3j93IxyQzPt1SmlrM/RPWW7ghcIFvceiX/nO5Q8kagVJXnP5/G4Lt9g== 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 BACEE3B35; Thu, 21 Apr 2022 16:16:27 +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 23LGGRV1004047; Thu, 21 Apr 2022 16:16:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LGGRKb004046; Thu, 21 Apr 2022 16:16:27 GMT (envelope-from git) Date: Thu, 21 Apr 2022 16:16:27 GMT Message-Id: <202204211616.23LGGRKb004046@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: 430203506351 - main - pfsync: NULL check before dereference 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: 43020350635150eeb439c035f608ec9e78ddff8f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650557788; 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=+UWtTW4T8rj+W+5aw+OQ+h9L88RTntSix0aSW48PCP0=; b=JXTpaA8VLa5kHBX4/xC3/mFVwsdOvIi1D7yZVp2Dvz9OzjbeS3JZH0IgDXeQvZYfpGmSpk MvrMgOr4pUr1SwFFYXIxOixcPhDL7bQ9ri7KHLIvXa84DqqcAYKyRd62HVM2I7eEhVI+sp sqdZxFsUgo7iuGbqHswKVetAMyfcjgi5TvfQ443Q/NH2wMrdaKzGZmezMnafVOtVeRzmzl uAuOP+SpyOXPSpm7DnebA9h0q8DLhFjouCKpaibHBcaOyLPIj3o0hUm2f6j0JEzZsRDzTT 0Bu8mhApAcP8QvulCwIPZQXho5rUYoYY7vPDh3oTn/4da6bfkk41dHtugtFDqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650557788; a=rsa-sha256; cv=none; b=vn2W6t7Od/7aA2cBhL8G5Bj2RmoLHyI93GWUVINEb6UYGZKd7myDZf+WYScPUmp5wCjJ6r JNPC1Z/j1AYTDjChv+2Uu4DzTvPgwN/tfFOPitvpHqesxJAAyTmUerwWj/tXy1o0F8gVZ4 8AgTyQWVPpUaEjTCbwG5E7HVS9SooYpC/XJkDLjLuJEIWVTmzB2kBM76NjamwlvK6UoQVK tLI6PBN9LzKvgXNkaW/ICofDPu6GK1aSPDAlOikFwzqxjLq8uSDOp0QHcZvimbcEhuSLSX qoQf8opZysRu03B6csByum7SvDEu5oJrJUXltn9mcfi183q6+odnQ1unruL4Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=43020350635150eeb439c035f608ec9e78ddff8f commit 43020350635150eeb439c035f608ec9e78ddff8f Author: Kristof Provost AuthorDate: 2022-04-21 12:40:32 +0000 Commit: Kristof Provost CommitDate: 2022-04-21 15:59:45 +0000 pfsync: NULL check before dereference Move the use of 'sc' to after the NULL check. It's very unlikely that we'd actually hit this, but Coverity is correct that it's not a good idea to dereference the pointer and only then NULL check it. Reported by: Coverity (CID 1398362) 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 1f4afad129ca..8edc5564b9a7 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -1735,7 +1735,7 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) { struct pfsync_softc *sc = V_pfsyncif; struct pfsync_deferral *pd; - struct pfsync_bucket *b = pfsync_get_bucket(sc, st); + struct pfsync_bucket *b; if (m->m_flags & (M_BCAST|M_MCAST)) return (0); @@ -1743,6 +1743,8 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m) if (sc == NULL) return (0); + b = pfsync_get_bucket(sc, st); + PFSYNC_LOCK(sc); if (!(sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) ||