From nobody Tue Nov 04 13:24:52 2025 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 4d18M902dsz6G4Cg; Tue, 04 Nov 2025 13:24:53 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d18M85P1tz3xTj; Tue, 04 Nov 2025 13:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762262692; 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=kSahiKcMXazhJPpiCpSrk3vVhKFw0n+rzTjjk133H0U=; b=pujXeVSZGmh0vFshdmHmAJUnDCmNG5KY8F09J6R7sV0pOeOH9N+YT4n4XnF1JBnfKF0DBh zL8E3pPKklv0UlzKw1Ufaiksm5NcJdwkL/vJ0wdKnZtw4SjuAxwJTgfje7Mji5qy6mkfkL C1VF3UH/gVUyL6iWG/YYpRA+JrjDm+pGsdArmTVjh4qu4H5kIjH6wU0fDvz3O4pjahLy09 XINo1ax7YB/pqjKG4Bb6lmrzajHf7rMBGt6expT2vWchLIQG0bPKf5Lszj3rneCfbJ72Ec Pg1Yws1ANF9vJWN/m57VDBwN5s7nvREtcB+MFGDM7DZ9idjes/5e2sO3xgNRsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762262692; 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=kSahiKcMXazhJPpiCpSrk3vVhKFw0n+rzTjjk133H0U=; b=HEhtmh0tzjDn/fPkJL4vzcWRzFSLVqhmHId+FeR1VUKk6wCs8CvZV2gzUV8X7oHclZicnC S6qjracxuGPD3MqHGPHAFJAB3vWZ7bH76EWiO1IgMC1EvBll3MtdeeIKpfrr4XOEfhBYHi YCQwW8QR/+j9dVckgUEJQN+TQ5TjjeWLOAO8rsqUBrIPcW4QImh7kG8KuYGv8LW+lHtNTQ p5EDe6H+odYVVrWVyFrm9jYh/TLvOZnIs5MJXdwqh7jYZFiIPw695/pGmx8Jf6d4y2rKKc Kd4A9DB1z62tLRjVOf9VybvNX9Cxv29oj6CqlaBngAZQwIASnbhUGdzRLRfIvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762262692; a=rsa-sha256; cv=none; b=SilujY8Z8MWNndZL8eMnLj1XvWBb3lU7sZ41XfZQvxK8Vjr2ciN8PV6Kkc5nGYo9/oPopj XKlZNix8caIRVlmaIyj350AMddoFzOHW1cPGeZ+4DUqpIVd1SAI18xQpV5LKtgcMDMI2xS rfm1eydgMw4KQXmOSbys4ULZje5bem0kHyQNG/NWNuCAYcdr3vfvj8CJzm9cQkw6TDB43s PKvrxBDm/aBXd6orHSr1oXjT9f4spltFaMYZe035KMp8goi2waWtbhBzzAtOUKFt8ao6q7 rgoQfW+2HYbWmxI0P6KyIJAauQ/tjMuJnj3bhwoxYQ0hRyveUjPpUo2ibXZzCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d18M84xP3zyXk; Tue, 04 Nov 2025 13:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A4DOq96071744; Tue, 4 Nov 2025 13:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A4DOqlQ071741; Tue, 4 Nov 2025 13:24:52 GMT (envelope-from git) Date: Tue, 4 Nov 2025 13:24:52 GMT Message-Id: <202511041324.5A4DOqlQ071741@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: 9769eb9282ea - stable/14 - altq: Clear stats structures in get_class_stats() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9769eb9282ea7cd27210076adf1946b9235aa916 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9769eb9282ea7cd27210076adf1946b9235aa916 commit 9769eb9282ea7cd27210076adf1946b9235aa916 Author: Mark Johnston AuthorDate: 2025-10-27 16:27:40 +0000 Commit: Mark Johnston CommitDate: 2025-11-04 13:24:42 +0000 altq: Clear stats structures in get_class_stats() These structures are copied out to userspace, and it's possible to leak uninitialized stack bytes since these routines and their callers weren't careful to clear them first. Add memsets to avoid this. Reported by: Ilja Van Sprundel Reviewed by: kp, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53342 (cherry picked from commit ff08916e9ac689e6ce734de72325fc2bd9495a35) --- sys/net/altq/altq_cbq.c | 2 ++ sys/net/altq/altq_fairq.c | 2 ++ sys/net/altq/altq_priq.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sys/net/altq/altq_cbq.c b/sys/net/altq/altq_cbq.c index fdf39690160b..2333b9ea8678 100644 --- a/sys/net/altq/altq_cbq.c +++ b/sys/net/altq/altq_cbq.c @@ -173,6 +173,8 @@ cbq_request(struct ifaltq *ifq, int req, void *arg) static void get_class_stats(class_stats_t *statsp, struct rm_class *cl) { + memset(statsp, 0, sizeof(*statsp)); + statsp->xmit_cnt = cl->stats_.xmit_cnt; statsp->drop_cnt = cl->stats_.drop_cnt; statsp->over = cl->stats_.over; diff --git a/sys/net/altq/altq_fairq.c b/sys/net/altq/altq_fairq.c index 6069865101a0..0a00168e547e 100644 --- a/sys/net/altq/altq_fairq.c +++ b/sys/net/altq/altq_fairq.c @@ -857,6 +857,8 @@ get_class_stats(struct fairq_classstats *sp, struct fairq_class *cl) { fairq_bucket_t *b; + memset(sp, 0, sizeof(*sp)); + sp->class_handle = cl->cl_handle; sp->qlimit = cl->cl_qlimit; sp->xmit_cnt = cl->cl_xmitcnt; diff --git a/sys/net/altq/altq_priq.c b/sys/net/altq/altq_priq.c index 026346639b2e..fec488418546 100644 --- a/sys/net/altq/altq_priq.c +++ b/sys/net/altq/altq_priq.c @@ -597,6 +597,8 @@ priq_purgeq(struct priq_class *cl) static void get_class_stats(struct priq_classstats *sp, struct priq_class *cl) { + memset(sp, 0, sizeof(*sp)); + sp->class_handle = cl->cl_handle; sp->qlength = qlen(cl->cl_q); sp->qlimit = qlimit(cl->cl_q);