From nobody Wed Apr 09 21:17:59 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 4ZXwlW48Fxz5sP68; Wed, 09 Apr 2025 21:17:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZXwlW2NsRz3tCx; Wed, 09 Apr 2025 21:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744233479; 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=Dv+jlFT0SRKDwsYHVpoa0BN9mbICXdnGbIPSV2+DEGY=; b=R/mOhTjQXhahguwBFl3qwUF0bN3dwEQGnKCQSCTQ0cleBDywxGftH5y+c5iLEQ2FCBy4pT My4oqujcGOdc/g0qRfZqk2Mi7PfKW1ojJeVuGU+MP5pHayZ3WTsHncer48GSqIGOYjrmCt z40YUzi7/rPokWTUHYOBxgZlFISSeyJeHzx7PDtJIMbK5AT3KpnBtJEC/mJ4rPBEm1TEgr XxeIBy1m8eiEKGcPWYzN5Jnx2lxS35EUOlaBGM3tloOW2SwjkrItM2+DWvhoWEDnhHA/T+ 862hn57WPLQvl1EIrjQ4cRWccrNWOx9tz4fNdgGWwdq3b1JBDy/TCSl3UA9Mow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744233479; a=rsa-sha256; cv=none; b=C4jMiJZc6xmtIbboOMENHGjkYgItO4WOdugw3j7vZVWKpAwZSgDek4igrGK0ppLBlUbH7O COMH/IdKRu51jKjQhcPXgZBGDyT+Ofyi4FnxueoQcjbhe1JDHolV68XoLdVIjG5xaakIHa c4Q43+xhkhmwil3lhzQfpol/C4/F3VOMYsUWAj5iXTzzibCWLm8qGf00fp4425TebKySDk sws1uDUsIBX24/uNZDygZubwmVBm1+XXkFIqeX49TZrHUiditDPb5LB+2hjg3Va79+imEM R2/mmrIloOfWdh0AmmcyYu9a4YtYXp+HL8LhsQRWVEtxjGw+TaAzcwuD5uaQWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744233479; 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=Dv+jlFT0SRKDwsYHVpoa0BN9mbICXdnGbIPSV2+DEGY=; b=FrjUK/kj1H/XQq3EAbwyQdXW4x3vWDw7q3RzUG5NakzJrbk/BlxwRgpAUnmeRUxTX1OgLy dQhZSychv1oWzks4TtwwKgt7tDYA75bYMY19f9/l1eC3fgDY7NFKzuCHQphn2RHJojk5ko lm7XoIVuoHTCiRZcI5qBWoZVCG9fDUCCdSnGF1S0FdB3G/1SpX4+7cAhBDsmDcgW9Z51OO cAp+rs3bFax5dimP4tlbeaCy2x3mic2zSv8/nEBQCGM1dYrls80UTmbT3/Xpjjjz2Prg+N 86rv2dS+rV+4pC2wKFwm9r7eUXUpf7RrmooxIpnffadzgy/OTpYEMj6qMy6AaA== 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 4ZXwlW20MTzb4K; Wed, 09 Apr 2025 21:17:59 +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 539LHxBv078173; Wed, 9 Apr 2025 21:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 539LHxuA078170; Wed, 9 Apr 2025 21:17:59 GMT (envelope-from git) Date: Wed, 9 Apr 2025 21:17:59 GMT Message-Id: <202504092117.539LHxuA078170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ed1b3f13e72a - main - kboot: Free prior segs in init_avail() 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed1b3f13e72a53af1c68f0ae1cf359e4da7c6cf5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ed1b3f13e72a53af1c68f0ae1cf359e4da7c6cf5 commit ed1b3f13e72a53af1c68f0ae1cf359e4da7c6cf5 Author: Warner Losh AuthorDate: 2025-04-09 21:16:57 +0000 Commit: Warner Losh CommitDate: 2025-04-09 21:16:57 +0000 kboot: Free prior segs in init_avail() We can call init_avail() multiple times. Each time, we want to toss whatever garbage may have already been there from a prior failed attempt to find a good memory map. Sponsored by: Netflix --- stand/kboot/libkboot/seg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/stand/kboot/libkboot/seg.c b/stand/kboot/libkboot/seg.c index 395c593bcabf..6979d5cfa5fd 100644 --- a/stand/kboot/libkboot/seg.c +++ b/stand/kboot/libkboot/seg.c @@ -20,6 +20,7 @@ init_avail(void) free(segs); nr_seg = 0; segalloc = 16; + free(segs); segs = malloc(sizeof(*segs) * segalloc); if (segs == NULL) panic("not enough memory to get memory map\n");