From nobody Mon Mar 10 20:17:41 2025 X-Original-To: dev-commits-src-main@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 4ZBSqp27rcz5pbhr; Mon, 10 Mar 2025 20:17:42 +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 4ZBSqp1Hsyz3p6Y; Mon, 10 Mar 2025 20:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741637862; 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=KrhzKbfhhOapqUC2FVrK4+WTWU8f/zeq+ld19DAiFp4=; b=p9mDGHICZEibilobJPn0YaXOVWm8nSvgGpjfAMuHtShbHjSfIBZ7ROqnavWfXdoVcEuVt9 E/ttX65yssR14J4qI5OL3GJhrBx+ypXimeSuQl8gQGNz1lQKHcqvy8qhiP9PwReB+wRI6K JgLyRIE3W55JdIaLGzwUlRqu8/uiaCVjEbh9LFbmAm0BFEI10OAZObhpTJuV3qn178udso 8pCONgyZ4Cul7j/J/URLo8+mgl1l2CqkQeEcLYPR4vxEsvNbGlGsQlkOlduh3mg5NhJKNZ AN5eZes7bwP3KJEsr4P9e34IkajBg4xY8GkIaWHU+bfAihC/Tt79vX9tp6wPbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741637862; a=rsa-sha256; cv=none; b=V0qwwiJ00Hnk5w2gyeqxWGCQ435nXJ3K8DBFuxj/2JMIsFcZjViK4PC5smSbREz7HHCzr1 AblYLvHqgJbG+s0aRXenuApWbqrnPvmcroI+xQgHJPXRlu1B+jpKAxLWIduDqrMATZ9vWO 1fSqZPhyYV0TBGlT2maeCBy8bm94BFm/SVKdLi8XuVaGrfnrZKWN0BBmXm5ri3BHWuOlSJ ncnwYWmlxo0+qmrKnrxR9Zql+TA/DJ+s+4Ejluz18YQJrXaW8VvpxCX1PEQ6XETvxbw+8f 5NvX1Kw/NZ6rvontKjy0bzcxyPuYu1wzYlY3hWIUWETcoHI9U4k7dHkqja5vvA== 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=1741637862; 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=KrhzKbfhhOapqUC2FVrK4+WTWU8f/zeq+ld19DAiFp4=; b=UMk9Sc/ElADJfouXQQqqIg2H7Nq8kb9IJwCCWm48ATpUCwh3l5FqRQSK0u9FZU0NYmYL9M iDJvePk0/e2DXaXduif+T79CZRs7uAqyKp6weNcOFsNtgZCGNhU/BpXi6d8GfJXfjvSiUe TfvPPUkz+AM7QfO33vmazhCMcPKIILWQogIcdUtB+urjSVjVFVZTX4R29zxJ+CLGGTMI7V 3NGFKWBrQtlw66xkOg6URHghdKK07Xlv2EGWBOljHVRADiR8VnPQbfyuGTKfur3Ui8yqG1 d1nHm8K+lcWXEZMAuh296GBQXa9n3OTmJIvFd1FUOu8YxsvmCGtK7bPzj4d2rg== 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 4ZBSqp0KzPzvF5; Mon, 10 Mar 2025 20:17:42 +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 52AKHfUO026720; Mon, 10 Mar 2025 20:17:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52AKHfFf026717; Mon, 10 Mar 2025 20:17:41 GMT (envelope-from git) Date: Mon, 10 Mar 2025 20:17:41 GMT Message-Id: <202503102017.52AKHfFf026717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c5a96f09df32 - main - mb_unmapped_to_ext(): fix m_free()/m_freem() use List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c5a96f09df32810319d39cb905662ad7504ecd7b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c5a96f09df32810319d39cb905662ad7504ecd7b commit c5a96f09df32810319d39cb905662ad7504ecd7b Author: Konstantin Belousov AuthorDate: 2025-03-06 17:36:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-10 20:16:58 +0000 mb_unmapped_to_ext(): fix m_free()/m_freem() use The top of the chain is supposed to be freed in mb_unmapped_to_ext(), use m_freem(). The _mb_unmapped_to_ext() helper only needs to work on the passed mbuf, use m_free(). Reviewed by: glebius Sponsored by: NVidia networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D49305 --- 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 26be33658ab9..2b2b032e644c 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); } @@ -1099,7 +1099,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);