From nobody Thu May 29 18:45:25 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 4b7b0P2BWPz5xLvW; Thu, 29 May 2025 18:45:25 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7b0P1NJ8z3PWl; Thu, 29 May 2025 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748544325; 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=i/C8d0+e9L4tENa0cRxqcxTLsJqiVVlxW6KN6y7Ubs8=; b=YcRRSctGvimPi/1ILWAZoj2m62BwEEUJxWfTEV2SftKL7xl/ta/1QaNJ6GaOJ7sSIZt0mR WLx82uOWpPEoC1BNTiTgR62OyHMBejrfgzsBC8riiWxuKRbMP/Yhndd2xl/UTJhM9m90FK y/1Se+0fgVmH+5TxcRxF43SLn9bibGNkBXHJ5vAQIQ48Wgo3jkEnOgMJJMPMbh2pXtOa7d elZXftMFRzx4kYiNb/hLk7bFr1ChbwVyScGa3K7ewQV4lOEePOUXiPfzaEMXeexGntKdAG 12Yw9F9N0WQr8kN4EMqtxAoaQtXP6znS3ne1iOL0HXXFkz+FOxCnMszuSyYG7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748544325; a=rsa-sha256; cv=none; b=TydotF5kNoXcyS36IIBYBYZoeU0jo9zkiZqjmAiMKOTdYzHyWv/d3OO3UdzCnoAFCe3UeJ xJLqtBAQ5KyTfSL9BwFnDOgTDaagd12GBuedS7A9tv4WM1zQx/yxRtlebwU3MEvzcxfAfV tbLIR/7+JNKyxSBAn4VZpjU63xtOqTy+EwQuVjRyaGgljKZIlHDibsCjgA4Jxj4aX8GS9G ugxJ4jK8HHsPJ4+sNpp6p5kzK+Dlgl2qKC1TjslVwiIEkDA202zv9BI4WPYmdwcSFOXtAq 7t0WfXlLHARCIUYiK4Jp48/j5A+oZwfImarM6vtdUT2pezHTumXkt0FclbUCfw== 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=1748544325; 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=i/C8d0+e9L4tENa0cRxqcxTLsJqiVVlxW6KN6y7Ubs8=; b=ncYfQc86y+BZUgwc/aYXUnTZVKkpQt4puP0eokOqZLhqjfswrk9sjPqxLxBH8O7euCJ92V ojyd2fu9Vvzsudt5of0m/LO2gZjH1lLXhOdZDi2gqrVcJQgn47NuvvZ68XWMIB8Tm+rtcW 1dTGI3Md0WORk8qZG14ZAEcLrCvQkhS7If0H5FIIzKLsXCrwabtAUXvQ7Ckx3TN0Xkna5O 84bIQBxhVCsQ46yxfXpcQO/Nfjexqqg/YTGHchH1MrZ0byuYzkqJThayyH9Z9bfcUQg9o4 6G6wKuDHj0zssKta2GSyltOlRwz5To9Wi/CyvUskU9Mg5RFw81LeGKkslhv1mQ== 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 4b7b0P0z2Jz44w; Thu, 29 May 2025 18:45:25 +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 54TIjP9g099321; Thu, 29 May 2025 18:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TIjPiO099316; Thu, 29 May 2025 18:45:25 GMT (envelope-from git) Date: Thu, 29 May 2025 18:45:25 GMT Message-Id: <202505291845.54TIjPiO099316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 23204710f2b2 - main - unix: don't free the source mbuf in unp_externalize() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23204710f2b267ea396b53f81cc3b8b111d4aaf1 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=23204710f2b267ea396b53f81cc3b8b111d4aaf1 commit 23204710f2b267ea396b53f81cc3b8b111d4aaf1 Author: Gleb Smirnoff AuthorDate: 2025-05-28 18:54:26 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-29 18:44:52 +0000 unix: don't free the source mbuf in unp_externalize() This makes calling the function simplier. --- sys/kern/uipc_usrreq.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 19634e3916da..c411f22970e7 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1526,8 +1526,6 @@ restart: while (control != NULL && control->m_type == MT_CONTROL) { if (!peek) { - struct mbuf *c; - /* * unp_externalize() failure must abort entire read(2). * Such failure should also free the problematic @@ -1537,14 +1535,9 @@ restart: * Probability of such a failure is really low, so it * is fine that we need to perform pretty complex * operation here to reconstruct the buffer. - * XXXGL: unp_externalize() used to be - * dom_externalize() KBI and it frees whole chain, so - * we need to feed it with mbufs one by one. */ - c = control; - control = STAILQ_NEXT(c, m_stailq); - STAILQ_NEXT(c, m_stailq) = NULL; - error = unp_externalize(c, controlp, flags); + error = unp_externalize(control, controlp, flags); + control = m_free(control); if (__predict_false(error && control != NULL)) { struct mchain cmc; @@ -2322,13 +2315,8 @@ uipc_soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio, * without MT_DATA mbufs. */ while (m != NULL && m->m_type == MT_CONTROL) { - struct mbuf *cm; - - /* XXXGL: unp_externalize() is also dom_externalize() KBI and - * it frees whole chain, so we must disconnect the mbuf. - */ - cm = m; m = m->m_next; cm->m_next = NULL; - error = unp_externalize(cm, controlp, flags); + error = unp_externalize(m, controlp, flags); + m = m_free(m); if (error != 0) { SOCK_IO_RECV_UNLOCK(so); unp_scan(m, unp_freerights); @@ -3541,7 +3529,6 @@ next: } } - m_freem(control); return (error); }