From nobody Thu Oct 30 14:14:55 2025 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 4cy5jD0rG4z6DH5d; Thu, 30 Oct 2025 14:14:56 +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 4cy5jD0F0Nz3T98; Thu, 30 Oct 2025 14:14:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761833696; 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=K8n45E8TOBK0KXEdwFyyyNs0ctKox7DGEBL82kwX+Kg=; b=eOaaBFSwV9c0dP+reZOa4I0Ro720tTjsOwRNenp1aMwV7d1cl/js2iD89FzNmJd6EyDGEj w4q+t+e3Q6vIPsvGc0nM+XB3aKdoCQn3sxjpaRCsiVzoZe0vzWPCaQuMteWU+fs9cRBX50 Uy3kPMdcbPNeA1n9wn8sDLQjMkIUrcWLLWtVioKpwRnaYMNq8h8tBh/9jirU0F3eJdCB6E fCvlgoAOqPPFo5bKe3ygc0CHF3HsnGshL3uJTFgv3cAp4u24DcXdEIlUfwZcMPRE41A/lx EnSmTad7CJ02RZCggcc5vibmSYehnVb/QBeNeoRWZMcNaUrX+4Qsv0hOijddgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761833696; 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=K8n45E8TOBK0KXEdwFyyyNs0ctKox7DGEBL82kwX+Kg=; b=Wmb7pJ831dhJ8JWdcU5oPg5tDRssWKZgqaxbKi0BTv3TYpie76JGtrD9QIwqRfWIxmPws9 Z25+dI4QC8Lhgvk6fC/UHZTW3F6RzZprLolYqNnIEESCgZU9OfkuAo6cL2/rKo/B5sM5Zt eMxEJBLtYRA4eIyyDiA1IUQ/YYE6vseo9CxHj6g8EgGdC8Px7cjgXJGGml3Ax7vPvEYgNY MXpQ2MjADiLDQ2E6v9TlexvyxTWnaoNQkkUyfK0waCXxMp8DpvWHOvSGG8kxnwc26uvbiM wpIEfc/Xe1eS4zdRGkhFxqqbvffUVaPU4xDvynDxifJpd/iK60ZbpyF5x9w8cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761833696; a=rsa-sha256; cv=none; b=ieJBHbdXVmPIQRWz1AwZr09DZqx+xZAx/GZ8duca0MFjr+/E446ed4XLQm9gJUbg/6uUIi AhHlrMqGjmVSDwdjnjbf2kOx1fdYWykAEYAnQ+umX2dKUODmWknE+8fI4r1ihpyYMQURKY RQettGdEFlXC3H5TdvavGFWgavwu8NOocSpQdNnqWlZEOlB25/eENP2/YORfSn3nhfGp7H SwHLHamdLPf6aFW+M6WIFnI2V/PuJzn4/eO5RS1M8VjYejfqu3Z15K9wPkidvF7ASqeEwy yNmPZTfHxd2Da/sRH79P+uIfbKdO8+0dyAfuPf5QJy00y0UGxC8drJ1gLAo+7g== 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 4cy5jC6n51z9yk; Thu, 30 Oct 2025 14:14:55 +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 59UEEtQ3096762; Thu, 30 Oct 2025 14:14:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UEEtVo096759; Thu, 30 Oct 2025 14:14:55 GMT (envelope-from git) Date: Thu, 30 Oct 2025 14:14:55 GMT Message-Id: <202510301414.59UEEtVo096759@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: 879808d2e5da - stable/15 - altq: Clear stats structures in get_class_stats() 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/15 X-Git-Reftype: branch X-Git-Commit: 879808d2e5da680797b656dfc7d3457154c9478b Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=879808d2e5da680797b656dfc7d3457154c9478b commit 879808d2e5da680797b656dfc7d3457154c9478b Author: Mark Johnston AuthorDate: 2025-10-27 16:27:40 +0000 Commit: Mark Johnston CommitDate: 2025-10-30 14:14:45 +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);