From nobody Thu Oct 22 17:32:22 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 4j9YBH3xkrz6xPjq for ; Thu, 22 Oct 2026 17:32:23 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j9YBH0JJzz3HfD for ; Thu, 22 Oct 2026 17:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690343; 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=QxU/uctD0VBMylA+N2jh9OyOaTZN6L1YzITKO42cdKA=; b=IYZy8Y9qcSSF2XaWjc4eV+0hfq1ILX5uLPQrvqcU8fhwTS7twCmu9BKx3Chtxjvn4lw9wo r6jWEuUfcTAe3KgbyF6TE9N+hJC6EcQzqkc5gECVV6pSeetBFX4dDWTaZNBBd5TBg2JJXR P1tGhnI4P3DEBRydog7+PqNhz8exJJgljQy630KD8t4inRDUVEVAh9Wb/Fp4MbGW7BWtt5 OCH7SrA4gXkknjDUndk6UaU8qjFu+Y9KHfNqxrvHM8bieKQ8FWfk8SM8qzMi1kr3n7WV3E Jqwx5i7OJOkxkm98mPfnq+LLGfoEQrz5WQu3mzb3yEY8jIl3zk9xgtAvbq7rlg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690343; b=XI0eMDN1gpIR52fw7yaEYDns83bPJZRMpyKCn2yjtAS3Kf42eI6M/AQIq690NcvuSFyzG4 xzowIM9gSv9rMM9UrFGH9AWwUt2RG1IG/7Qch1GP5dVblfSwRZzeJluU8APMWFZf75YJMp j1HXXTB69+vDVRnHdRExRgywTKKOokUfHWL007KYwre0VZY/pErU2xFBg/jSCbrLr5vRbl dWIigJWn43hoMsJJnCJJ5lSSSVwz0WKRScqrECaMMDo3Tz0PJaLUAQVzyPze+RIH3tWLea 6ucGKdoLW6i/cOYBPsjTzfXuSZdQthiuIHkzLglRNTcrBYit901Cl47SsLadSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690343; 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=QxU/uctD0VBMylA+N2jh9OyOaTZN6L1YzITKO42cdKA=; b=WTy37h9FpqeYC4JqGl2KhKVHi8A3ic2p2dadRsiI+AueL5Xx2/VoPXmC/HS8NAcaKdFkVS o9JtzBxqCYEsAsWrzllih4p/q4r1JqaPXYgqdr6JKYjPxxsVvrIEwSd+08KZRIHbjBdSWn 01o8d810OggmO3r7u5MiViLnpm2DCXAxskFr1k4QpighSQvl7lik+iZvpMxsMFNc0MZT5Y GMvH+sXcWEm8akVjhMn87UkUKJ9IY/F9vtE4UYQIbKVoGvibtuAL5Wu3CMpxwkTGkAPY0d T1jWBCe8xYLe+BmvqOGlpeHPfSVNBBu3mQ0YA9GjPhtYop625+rPslGVKkIYLg== 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 4j9YBG6wyZzsJS for ; Thu, 22 Oct 2026 17:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c048 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:32:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jasper Tran O'Leary From: Mark Johnston Subject: git: fe99b555c8ad - stable/15 - gve: fix double free on ring allocation failure List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: fe99b555c8adb2c9d93df36c6b98822f25f7794a Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:32:22 +0000 Message-Id: <6ada48a6.3c048.2b91fda2@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fe99b555c8adb2c9d93df36c6b98822f25f7794a commit fe99b555c8adb2c9d93df36c6b98822f25f7794a Author: Jasper Tran O'Leary AuthorDate: 2026-10-07 13:29:31 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:42 +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 (cherry picked from commit 67f85bf4b3f1156f2300fb6414f6bb0ca446c436) --- 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. */