From nobody Thu Jul 14 13:50:26 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 4LkG8f3s7bz1J4H8; Thu, 14 Jul 2022 13:50:26 +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 4LkG8f3GG0z3yNG; Thu, 14 Jul 2022 13:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657806626; 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=AmtEghoVlCe93pehCYM7l29jbilmlIWR+UeciNEz+hI=; b=E1mIG/8izY+jBuFG9s4du6cN8z2y9YIFY0RNVLc6LFyjs3o6e5wNL16VwNx368k0Wo2yew able7zaPDV2SfbYeUqHFMvKT6g8/npmrPnZqG12q4/YPHDKGFnxEjWqr9GBalxRNokAKnA KcOso0eL4CB2qWoPPQsYTEuR6WrWqpL/K3mLQ+6cUiy6HffkNQYj6Vn4F2g/B9BdMCyO8d a1mtqKwGikdOT+IGfNchNmjQh+X6sOiwabmXBmyVp9thOlHG5vZvw/LZ6JKZ24no45zHxU Sn0LQ1FCd7JFBeflfwIIB+R5bwvPxZb9agCa5ceIn+DPSg7CB7XSC6eriUMaIA== 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 4LkG8f2KwRz14RN; Thu, 14 Jul 2022 13:50:26 +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 26EDoQaP067842; Thu, 14 Jul 2022 13:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26EDoQ3K067841; Thu, 14 Jul 2022 13:50:26 GMT (envelope-from git) Date: Thu, 14 Jul 2022 13:50:26 GMT Message-Id: <202207141350.26EDoQ3K067841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eedf9f1e93bd - stable/13 - pf: Make sure that pfi_update_status() always zeros counters 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eedf9f1e93bd1ee9448550b140dbbd2ab5926055 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657806626; 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=AmtEghoVlCe93pehCYM7l29jbilmlIWR+UeciNEz+hI=; b=qRHjQwll6y6ov8i5WDcSqjotaCKgJW0DED2yu5VO/R4J4MbsS+wwc5HykYj3H7qJ0b8Xwe 5r2CQtaiMzlTJTg2xr049IGwBXnKZsVYT04Xx4qTbM+ScRpg8R1vASaWkVt4ZBlqDIF4yg 2bzj5FzuSSX3xEeOuaQBTlaOdft+MjxzNTenU+rnfmkfa45UwLXlBc09oZGGV3M3fMaSLi J6kO0bD1tMufBd1ROtduBRS67qyXOeeF2YGyQoGuTdpCQW05adFJmndTiWweJ/WEs/Vroz Rl5LAs5YQhQ1/acaPjjDNlHH7l1R3oXYyNupg7OaVDUfMKffrv40YtYZNQqfIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657806626; a=rsa-sha256; cv=none; b=qwnosi7/lU7cUWuma4dQ3QY8/OhTpQO6G4UvuImGFl89vRqtZCIMdpdzEorVN7TXf/G47r 4VNHB3IXxRXeyME/5ZIpzF33v94rko8jcQnMdoSEKogy3BltZ3e7vnRbAqGIsJ4YFs8gGZ +YqxzwQ4L7Iguk8XuLsEHKFm83GShtin07wckZKCQmXRBX9c5YoOs7MRRK53M9JXbZCVke mvPVyrj0FOdxnSe/tjyUvFlNktJZX7wdtQw0bUYupEXy6flO9aZ3T+yMBhUhkgSl/DdUyP mDLMIFCutuYoWurHL8V5t6Xmw3spSwPCIoZOXolMjvcB1KW7kcEPcNnAxX+vyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eedf9f1e93bd1ee9448550b140dbbd2ab5926055 commit eedf9f1e93bd1ee9448550b140dbbd2ab5926055 Author: Mark Johnston AuthorDate: 2022-06-30 14:19:23 +0000 Commit: Mark Johnston CommitDate: 2022-07-14 13:49:58 +0000 pf: Make sure that pfi_update_status() always zeros counters pfi_update_status() can return early if the status interface doesn't exist. But in this case pf_getstatus() was copying uninitialized stack memory into the output nvlist. Reported by: Jenkins (KMSAN job) Reviewed by: kp Sponsored by: The FreeBSD Foundation (cherry picked from commit 333670372ffe2f1c562e1088a7779eb709006ba2) --- sys/netpfil/pf/pf_if.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index cdde753c41b3..02c46db409b6 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -803,6 +803,11 @@ pfi_update_status(const char *name, struct pf_status *pfs) CK_STAILQ_HEAD(, ifg_member) ifg_members; int i, j, k; + if (pfs) { + bzero(pfs->pcounters, sizeof(pfs->pcounters)); + bzero(pfs->bcounters, sizeof(pfs->bcounters)); + } + strlcpy(key.pfik_name, name, sizeof(key.pfik_name)); p = RB_FIND(pfi_ifhead, &V_pfi_ifs, (struct pfi_kkif *)&key); if (p == NULL) @@ -818,10 +823,6 @@ pfi_update_status(const char *name, struct pf_status *pfs) CK_STAILQ_INIT(&ifg_members); CK_STAILQ_INSERT_TAIL(&ifg_members, &p_member, ifgm_next); } - if (pfs) { - bzero(pfs->pcounters, sizeof(pfs->pcounters)); - bzero(pfs->bcounters, sizeof(pfs->bcounters)); - } CK_STAILQ_FOREACH(ifgm, &ifg_members, ifgm_next) { if (ifgm->ifgm_ifp == NULL || ifgm->ifgm_ifp->if_pf_kif == NULL) continue;