From nobody Wed Apr 27 12:50:31 2022 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 DFCFD1AAA9C5; Wed, 27 Apr 2022 12:50:32 +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 4KpJWX08Gqz4dVL; Wed, 27 Apr 2022 12:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651063832; 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=K5RH0V13xb11S43MGypr6juL3IqoQAygsX1oDJiesfE=; b=RgKcldbGvTwPwp1g3ZA7531qSJHx9zOIGvdpmpz2+ZsdK4skbKphUGKF1wORJstWWYKf+h Laxw0Y8QJMReokbIPN/P9o2wi2rPQ2pKMK4bz99i+R2OkBJbNgo+trSfrov0ESplPcR/jH UkJB14Sj2RfryY185k+YDLgsT0HqM3kGiDqYDvewDgrUjJjADzLSyI2VZYkkbXaZFB1BHP FRe4A/ZjuOmAiFygOxMmUi9NANEaMOnQ5SJoI4H1nqXgS/vTMb11CLDPR3ptAPKLR1KTZO Put23zcv90gFxRnkGIWTVNWymkE+dKcILENzAlSLWS8OF4UtibIjYRhQAEBmMw== 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 92C3823F28; Wed, 27 Apr 2022 12:50:31 +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 23RCoVkm011799; Wed, 27 Apr 2022 12:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RCoVZZ011798; Wed, 27 Apr 2022 12:50:31 GMT (envelope-from git) Date: Wed, 27 Apr 2022 12:50:31 GMT Message-Id: <202204271250.23RCoVZZ011798@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: a618bb0f676c - stable/12 - pf: counter argument to pfr_pool_get() may never be NULL 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: a618bb0f676cca4f7e0898b0848acf8e88813c03 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651063832; 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=K5RH0V13xb11S43MGypr6juL3IqoQAygsX1oDJiesfE=; b=flj23oO7oEA4dlerQJKC3aHwam1CPzMizokRUsBokJKGddpvPHi3FUDzRFVFYyNECFpl/1 h25vFB3tNCMycNaIFdGj2rDor5HfhSwS6MMuVcMiawJRuNZyP3ah4AUzcmCAcal/OKnXHr fnGEW8qMGWMxx4F21FLYwyjo+vSZwajhQpjPAKU3qWOOuyUoj6pJQTZXn+KJNauhGgFCfD lF5vcSv4fDtS38eYRNKwUFK5tbJF2vVstvBHNi6B7P0Hvfnk5bpV9RGVlHa1AlVni+UI50 DlER0c5w5dVuDZZggn+ESoIvqAWuZdmtR1wA02kH2g1jgVYtKoAcmHLHQOzpIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651063832; a=rsa-sha256; cv=none; b=MJCGA5/a+DvqwNNUWgQN9jv5HnTFZIVb3F3pMrtZ9QguiT3+QLbIsPuPWBwNxQF03qo2i+ TrH+cQsoi7nDoG/8yXeJDkvkNN3VR0fh0hjh9sD+YmMF2VPYndmw1AwWbYe+mAkwjX1E5e dHDnRjETdQcLXLQHE3aqAn7He6wGfzR6Kb6NyKtJSspoLu/bRS7cPyofhmJJFJpwFjzTsq jgX4b5YxWr5Fwu8KMtss+PEntYZWDWK6fx86+WJ9+snm99XjyycCPrKZxBvPKdbDR7Gtiu ir0CS23AWZScE1/BF98NdILMhtOgngABpZO8FZje6RYcUb9NnNIhKqM2ffIOEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a618bb0f676cca4f7e0898b0848acf8e88813c03 commit a618bb0f676cca4f7e0898b0848acf8e88813c03 Author: Kristof Provost AuthorDate: 2022-04-21 12:53:05 +0000 Commit: Kristof Provost CommitDate: 2022-04-27 06:49:28 +0000 pf: counter argument to pfr_pool_get() may never be NULL Coverity points out that if counter was NULL when passed to pfr_pool_get() we could potentially end up dereferencing it. Happily all users of the function pass a non-NULL pointer. Enforce this by assertion and remove the pointless NULL check. Reported by: Coverity (CID 273309) MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit efc64d02a62f3254ecc0b22fcbcb8f73a079669f) --- sys/netpfil/pf/pf_table.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c index 0012d0f864c4..8e6ac382318d 100644 --- a/sys/netpfil/pf/pf_table.c +++ b/sys/netpfil/pf/pf_table.c @@ -2211,6 +2211,7 @@ pfr_pool_get(struct pfr_ktable *kt, int *pidx, struct pf_addr *counter, int idx = -1, use_counter = 0; MPASS(pidx != NULL); + MPASS(counter != NULL); switch (af) { case AF_INET: @@ -2230,7 +2231,7 @@ pfr_pool_get(struct pfr_ktable *kt, int *pidx, struct pf_addr *counter, return (-1); idx = *pidx; - if (counter != NULL && idx >= 0) + if (idx >= 0) use_counter = 1; if (idx < 0) idx = 0;