From nobody Mon Mar 17 00:48:52 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 4ZGGYw6Tgsz5rLDw; Mon, 17 Mar 2025 00:48:52 +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 4ZGGYw3vnCz3tJT; Mon, 17 Mar 2025 00:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742172532; 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=pf32pNP+jFdn53ehO3KR+HaqRpBs141vRdw7vuvTNZY=; b=dvi6GYYZr6F30jbmQrmZWxwUIJypbR4C34ihcjWnjbeGb1ObMWjJr+Fw5dCVjriIvb9mUY Z1p905K9XLy4EaNTL7znx2y4F6E6Llt2rCmj3HarJyDtdVp8yfAqs6BE6tQU1XqrTjQ+VI Oh+3o9VZH5GHjUmOb6LxXfqdGYVPETt5xvMtwug7ZYr8kGqsC8TQxPZoXV9jZaZqhVZuLC U5Y9QNvy8F96LRhtIkFfii/j+35KgVq2+xFyU/nDh3HvX2F12DsSAT3vN6kD9gxUg94LbE QymO9rvNkqv8SBdC/Jjl+EkO3Rbu+whID48rbapCRa51b/Ck1WUoCYl/2Ue7FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742172532; a=rsa-sha256; cv=none; b=GCoentyGecIIRC5XiezuD147VnbAiAva1q6AE/jfnNN8G8o1Q4ZZeHN2Pz5a/jMIRfaf/0 aJOWQmVlma9gEXrKTD1VQIDzxUb3VJ8daxu2cxq9gNOY+sL58VgalQyTRlQXUEpS18TD35 0Rf6ZUJxMrVqgFDv5CYT1s9uxt39CqpJxc+I9WEiuQVBbLLR3HOYETgMu3boTVWVvs2uZ1 v8cQlVUR3/e7ABAiRxQrRXWJLt+GaVa6VYlN7HYYAgTGhjFAxnAW0CPJVvM88eimXsBlKm 4OslqIGK1n/T/h825sGBxftS9rHrxBhPseABYe4CHQcpPaJhgqmYnoNDMEY81Q== 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=1742172532; 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=pf32pNP+jFdn53ehO3KR+HaqRpBs141vRdw7vuvTNZY=; b=M+c+Uv11vHWFvOEWjKBFNbLj/O5HtF1zao8Rch0lFTAfpQdPZRtgY/tk6HpL4R0WI1DzDn Urzsj1FM86qgve/wx5YCRmYS4/r0QgZX7WnXpByOdY2IICPZZE9zd6mXRKpEQUfi31vblz /rTjo8keHE2IecS1Ks3pSmL4LXA0HYAXQ/cHYm1my2kEx1SXzqKv2PVpqHkW14uKcJw95o zyba3CGjLDbQ+HVfv5lqSI0akfWXeB+NdcJObSpWMq9V8ACBx5xX8dWcrqLcuA0J9W7W4Q ERue1d6sW6FovXQejZkAoICp1xYKdpVpBbs+Rd4IQeewzAYzTh4PMAAQJn/0GQ== 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 4ZGGYw3FFgz88Q; Mon, 17 Mar 2025 00:48:52 +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 52H0mqYG013292; Mon, 17 Mar 2025 00:48:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52H0mqLL013289; Mon, 17 Mar 2025 00:48:52 GMT (envelope-from git) Date: Mon, 17 Mar 2025 00:48:52 GMT Message-Id: <202503170048.52H0mqLL013289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: eae0129ba7d0 - stable/14 - mb_unmapped_to_ext(): fix m_free()/m_freem() use 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eae0129ba7d0d69acf541da28e58f8035c411f31 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eae0129ba7d0d69acf541da28e58f8035c411f31 commit eae0129ba7d0d69acf541da28e58f8035c411f31 Author: Konstantin Belousov AuthorDate: 2025-03-06 17:36:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-17 00:48:32 +0000 mb_unmapped_to_ext(): fix m_free()/m_freem() use (cherry picked from commit c5a96f09df32810319d39cb905662ad7504ecd7b) --- sys/kern/kern_mbuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 0a9cb72222c2..a740c31789a1 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -950,7 +950,7 @@ _mb_unmapped_to_ext(struct mbuf *m, struct mbuf **mres) if (m->m_epg_tls != NULL) { /* can't convert TLS mbuf */ - m_freem(m); + m_free(m); *mres = NULL; return (EINVAL); } @@ -1098,7 +1098,7 @@ mb_unmapped_to_ext(struct mbuf *top, struct mbuf **mres) error = _mb_unmapped_to_ext(m, &m1); if (error != 0) { if (top != m) - m_free(top); + m_freem(top); m_freem(next); *mres = NULL; return (error);