From nobody Wed Oct 07 14:05:09 2026 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 4j0FJ56qdXz6vy3X for ; Wed, 07 Oct 2026 14:05:09 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0FJ53M0yz3N3Z for ; Wed, 07 Oct 2026 14:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791381909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIkX4/SlTGS+exfTyYE7HiQ6XmsNh6lQc5ES4UGeXO4=; b=MX4Vzpct5ULFjjWcwaf3bfWu4KuVoFDagqWyDEf5NeCEfgjjOwO2HTgiEShB7XL6d4VYSL YhRq4Vs8A8uhzBtXHIbz4m4Ii859uJKQXFS0Ctgh/PHiPuxVkwiOrVh2NwFMz2Vg7+XP5h bfJ7h0hK4ggWzP4mVTgyQ6XzMTgOTKgQY116wodGUQybrTUYC9ilgA8GsoVp3kbw6mkoCh hmwM20h2jAFllUcDojtsdg3YL7erqA3gc5QWZ+ZBVscPCuOewYyud5r5QtM9A4rxWJ5T8w c+FgLanDOtY0uf55RDehs+xRxTh4uUlUhTpLGrqy1JWn+mARInzszxwDDYmegw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791381909; b=ExIMk+WOpEtwRDohf6Bldc37saQrqWzpxOHgCPErOdTNESBXY8ACB8Wk6WRl4gQsK/eVYz pvR/edBI886Y2SWIbMs2QiJmIXGiKBorNd5CJM2NKQF5ZbzypajVm2BCMO0ec4WIgI55ql 5kyLq/KLSvKysyKUQpvrMAA6y+JzhKLCJJ4BYOF9CbrR28mqxfC5blGeE6O7lJ9nlIQLli sIVVT6WLKwhWGQ6Mtgbyo+e5xsuoHURxuAWc20Rosp/hkCY0HtwbAIcLitqK07W/QxMfk9 w954rqqP8obibkMttkbdIrzVikvY3uFot/ko7ELcvYuMIWBMPY3lnXyz3LiIiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791381909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIkX4/SlTGS+exfTyYE7HiQ6XmsNh6lQc5ES4UGeXO4=; b=S2QZtUca6YaXpVq+DHEA8PFgmywYjOTiDxaI6QwwOEx+6GLDQxe9vf4YnZoEVOVQtH9/mN 2L3LypAOikiJXa3yjdXH6SICrZLf6WUyLgLLRp36DfjUUGcUaEJNdBNSHMSQa15VRdMZlh Y7HG8DRi2Al/GPY1XWn6AWEgxm5hSZLld0xszoFtnka1iTyNHwToZsokc1jhNE4PaXau+I dla1aU20u/sWj2fyy9Lth7m99BeaooUMqt0vEAksOQuf519SD7L+v0bprmqdupI+i4pjj5 A9oJW+jv7J5Rb2TQEnLTg1vCKdIhLASptoNtSzVgJhOThyBwZnZUUWDJ5yO0ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j0FJ50sxrzx0x for ; Wed, 07 Oct 2026 14:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19da1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Oct 2026 14:05:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jasper Tran O'Leary From: Mark Johnston Subject: git: 67f85bf4b3f1 - main - gve: fix double free on ring allocation failure 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 67f85bf4b3f1156f2300fb6414f6bb0ca446c436 Auto-Submitted: auto-generated Date: Wed, 07 Oct 2026 14:05:09 +0000 Message-Id: <6ac65195.19da1.7a9800ac@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=67f85bf4b3f1156f2300fb6414f6bb0ca446c436 commit 67f85bf4b3f1156f2300fb6414f6bb0ca446c436 Author: Jasper Tran O'Leary AuthorDate: 2026-10-07 13:29:31 +0000 Commit: Mark Johnston CommitDate: 2026-10-07 13:29:46 +0000 gve: fix double free on ring allocation failure When gve_alloc_rings fails (such as when failing to acquire MSI-X vectors or during partial ring allocation), ring cleanup can be executed multiple times across nested error paths (e.g. within gve_alloc_rings abort and gve_attach abort). Because gve_free_counters invoked counter_u64_free without nullifying the pointer in the stats array, repeated invocation caused a double-free panic when freeing the same counter references. Check for non-NULL before freeing and nullify each counter pointer upon release in gve_free_counters. Signed-off-by: Jasper Tran O'Leary Reviewed by: adrian, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D60386 --- sys/dev/gve/gve_utils.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/gve/gve_utils.c b/sys/dev/gve/gve_utils.c index 707b8f039d88..498ffb305876 100644 --- a/sys/dev/gve/gve_utils.c +++ b/sys/dev/gve/gve_utils.c @@ -69,8 +69,12 @@ gve_free_counters(counter_u64_t *stat, int num_stats) { int i; - for (i = 0; i < num_stats; i++) - counter_u64_free(stat[i]); + for (i = 0; i < num_stats; i++) { + if (stat[i] != NULL) { + counter_u64_free(stat[i]); + stat[i] = NULL; + } + } } /* Currently assumes a single segment. */