From nobody Mon Oct 27 16:39:08 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 4cwK303BWpz6F3pM; Mon, 27 Oct 2025 16:39:08 +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 4cwK302MG7z3qXc; Mon, 27 Oct 2025 16:39:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583148; 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=v/1KQNxAeoRr+cpI3UHyapKkIms38SrXV/Xo13KOx40=; b=YaYEE806lW+TySLrXadSNRe0KF/QH6J2Gax5ls2lMNOu6N9uVk/toJWfPvnJ8c4rGdWMCr rXqLWMaH1lD+TDCDy8O+irUjJ1Guz9CORAG5+mI3zWN97ZV+lkUKPuCtai+KWgOeG62dmq V+fsLEyc39xUZpDtYfwBe5u/givYUG7ZfrzHj/QmIxTCRG4AExFM6keaFIz4RyUJ/r8yhh XrG8itgO9l6+oLLMUvkSCwBeS5E4wH/IXVQ6viGUHX/T/h8wuYFVDVsfABAoXUJIHtUPjP e86eM43WyUE2WKdkiWvLZgx4zo4zHjT5cWFJHBc+xx5swocl2KO1jlyDwBM3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761583148; 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=v/1KQNxAeoRr+cpI3UHyapKkIms38SrXV/Xo13KOx40=; b=K/6+ClTLdYq50+OWWd2M/Z46UJ1PJ3CrAdfycej65VrL4Kl/hEMRKAPKo3ArPeAuqDKNkq y8PEIxfcrhz61mdN7YS4QddWkUCuiqZ6mb++LPdQhLK+s8DCX7Edf+QWZR1TbQp3mwt4XA CuCJTaFmo6nDsUIDnGtrpoALwVlp8PUSRjIyEbDTcmtll94Iuv5beBNV239T798IVouyxK cAVWtaj9dntHK/dYc5dgPNhPHmvrVX2gWXlcO8CaYV8vI0KvIcmxK09V9cG8Uq3IVRNsmG j8rBv1TadfZ8iXrPX/tKzAHjHShDuixFizU+MOZD6zUjKD7cmu4gQlSeZPkQRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761583148; a=rsa-sha256; cv=none; b=U4xHFbIyfGg7WVc81dyqUgWHp3/JwYQfIbKG+yOPyxrQDwPiUhXFSe1NDogCpi9uH4Np/Y 0AoGt95NR5VAyZlCUgMbKM1HlsGfuYXGlyBst5N78Vg2/+nPdZAY8i9tsjSonW1m5bcJ93 dumYn9rsHF81DsD4T/wIi+vyLH3Gf6isOGNLJJPzj6pweZ8B8Qgo4htpPbBULqwxgvPHZ2 YeeVnFoQO5Garl1ySz4Pp7F5HyPv3TGVsvQgEqbFSGgldXRoK3fXN4mtplfRQ67AduhvvW CLKeVq9AaAW0025s56l5oFTxPxJvU44CKSvyAW+hY4zrSaEDw2K/JQTkdQ+Sng== 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 4cwK301mZpz1QNk; Mon, 27 Oct 2025 16:39:08 +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 59RGd8rt019632; Mon, 27 Oct 2025 16:39:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59RGd8L3019629; Mon, 27 Oct 2025 16:39:08 GMT (envelope-from git) Date: Mon, 27 Oct 2025 16:39:08 GMT Message-Id: <202510271639.59RGd8L3019629@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ff08916e9ac6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: ff08916e9ac689e6ce734de72325fc2bd9495a35 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ff08916e9ac689e6ce734de72325fc2bd9495a35 commit ff08916e9ac689e6ce734de72325fc2bd9495a35 Author: Mark Johnston AuthorDate: 2025-10-27 16:27:40 +0000 Commit: Mark Johnston CommitDate: 2025-10-27 16:27:40 +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 --- 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);