From nobody Tue May 6 19:34:41 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 4ZsT9s65TSz5vKJ3; Tue, 06 May 2025 19:34:41 +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 4ZsT9s4kS0z3rMM; Tue, 06 May 2025 19:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746560081; 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=YWfWqM8bHEKVeCLEVN2EwyO6PaPmrX4PeZBJ0LqcVh8=; b=mEwvEDk4AbpXQoVXH6C3kqewYHuifCVaB4LwmiXBMKX+MUj2g3X67T2a9h2SKlqNHeBo94 of2dKl1vExiBf7ochoD5GDIL33/DBStopv7tx2VBg3+/WLQ+8xRaxtOPjJA2PgG+vqLXsy ygWCYVbcLpFHOz38TpEX27xFmkFTJUkgdKrIjcZvXKPl5h3ACy5DTan4Tiz159qNPN6umt /OlBw6Lh3mBqM3ZmekYr4czj9MYTYYUTiL+v4c/9PcquHutHaSfcQiCFh8gc+TW74usVLk 1fnLcnxeSp4/yZ960GNyV+Dxeyhj/kprsTe+zHlQsfvO+085+BcyoCzHjhJK7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746560081; 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=YWfWqM8bHEKVeCLEVN2EwyO6PaPmrX4PeZBJ0LqcVh8=; b=W+BxIXORxcxF2qb1qca+5g/VrRbZL58JQIKwkVa+uPyPooA0LysX1Vyw/7fGmUr3NElWDx 9GXhMN5wpkSGzM/dDUvpupkxey54Z4XlYgzXRcEll91jMLKQZix3NFcAsuWxa7qN6cptfT oAvfB25AI5CTRnwtOfTQwFvqiDKiltcbTUq1FhNtIBe9eq6/+dMEsmVw/EDkTT6ZJC4PpK Og3UVh2soZYB1/86tx4Ajr4TGjVTqlj88QM8yqKkrK6swJKsgSymAJNVZjCDt77Z4D3qd0 Cu1NE2qw+wkfC4KZk24w13l3Vj5EBuTFgGOAjaScWV62WF3W+iqWspR1ucNEOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746560081; a=rsa-sha256; cv=none; b=GcWA2mx5GoU4UxrxkvOEruDwpez7CoRRActA61vILuXOoVHds547NgF0qEonhC8TZR5ACs IV17w+FCyXjio5s7atzopCqxKZdLR8iGVC62AczZF/xkq++hhGj9A8mh3A5mKK/4MKqzGN 9DCCVlBpljue0hGdemfYHBlvsdhtTEIOP67uSK9CWHUvT4j5W0my/NlSLPJ0olPUDzZSqX FSkL/QxlN1AZ0IohukMxpLEEDMRcXxgz649dy+Ew/ZzcCnkdAPSXyJoTxIQ0ZuL+Hpx4XP YUlI7/p3nyR3XBazedGEuoaYrataWsrn7P2e/OwYv93L8l6OzauI3W7WcpkTvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZsT9s4KRvz1C4J; Tue, 06 May 2025 19:34:41 +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 546JYf8U056529; Tue, 6 May 2025 19:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546JYfFo056526; Tue, 6 May 2025 19:34:41 GMT (envelope-from git) Date: Tue, 6 May 2025 19:34:41 GMT Message-Id: <202505061934.546JYfFo056526@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: 964fe0fd4d52 - main - unix: fix skipping of M_NOTREADY mbufs in unp_dispose() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 964fe0fd4d522c218cb73429e6304ce26ba61b50 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=964fe0fd4d522c218cb73429e6304ce26ba61b50 commit 964fe0fd4d522c218cb73429e6304ce26ba61b50 Author: Gleb Smirnoff AuthorDate: 2025-05-06 19:24:07 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-06 19:34:26 +0000 unix: fix skipping of M_NOTREADY mbufs in unp_dispose() Of course the loop variable doesn't need to be updated here. Fixes: d15792780760ef94647af9b377b5f0a80e1826bc --- sys/kern/uipc_usrreq.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 06b3317dc775..95904d2b9be5 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -4213,10 +4213,9 @@ unp_dispose(struct socket *so) while (m != NULL && m->m_flags & M_NOTREADY) m = m->m_next; for (prev = n = m; n != NULL; n = n->m_next) { - if (n->m_flags & M_NOTREADY) { - n = n->m_next; - prev->m_next = n; - } else + if (n->m_flags & M_NOTREADY) + prev->m_next = n->m_next; + else prev = n; } sb->uxst_fnrdy = NULL;