From nobody Sat Mar 23 05:45:44 2024 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 4V1p884cX1z5DYvY; Sat, 23 Mar 2024 05:45:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1p882q24z4CWM; Sat, 23 Mar 2024 05:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172744; 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=j7ecNT7Hpe0UVQMUPnSMSwSqXuXr9E8zpS8ESZchxwI=; b=oW3ug5G5UzRU1Pcdc1InC3NSCUewpdnknfX+es41oQT4MpPg7L+TS705Gfry3YEeKY2KMl tO2LfokFYTvMTYvXSeWxny2EX2UatX9TUDfaNkDBpDDgBnDIGEpioB35Ysx8a2KkIWHiZJ Jhyobt+n3nq+VCXBNlA3k9Y59Tq1HG5kMMKjA/N8VzoTyVX4ra7KO0kC8XRV3qXwrkwSt6 wp6P7YuUPKk/5iZmhVG3tmCf7SKIx4P7TCmy7JmG7VsnUF4ueQLp7b/X6tIbQvZ1a/9eHQ 20vo+1sMaoNpT28K/PMtveiSBC5s2C4DsuiNRDEgcLS4n1pQRChRKwp633c/LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711172744; a=rsa-sha256; cv=none; b=ZOGcIpbn8/s8dv/GHVGRgIybygC8USQRxoyS7E6enXEth4drowR/8U/XbuE3E67G43GT3n mRfni6lx5W28j+jQTICgO++CKZ8oiOaRvX6XPC0zYKNIHS3s6kkmpFhP/pI9WEf8KTpP84 TTZzfc1Ap+pYcKN4P2oWn1iovdbRagzlvhpkludIM9eVPUKvDxuk9Al3wbY1UcpRzXCchb N2izsCq9v17lEP2mHpTHv5kR/z8yZmBvrSOgcO9IrxBp/ftQUhPhaHrTgzJWsFXLDHNLlX 8S7KJsSU+3KFEP+Wa8eOFb2sESgInIlIsdL/9tF2TZvkM1e7KZeZA0h1R21P5Q== 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=1711172744; 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=j7ecNT7Hpe0UVQMUPnSMSwSqXuXr9E8zpS8ESZchxwI=; b=qQAaZtJLF5Apdt3wRO7ubxM6FdRmt4Q61H3kF3yEL4h4wFPxJrIoNrp54aFB5MciZD/y/H OgA1ElALzs++mrijb4RQsRlyr4d/VT//69gOAKfL518OwlQsz33CsNC49m2o3pbRos8PTv 3RyDIXWYtVEeFEDM/tWm4XCkFft137FApnGXyUdNd33JMyR5ts0frGyR9YdDK9xUNRxa80 W0CAJOQaAuS8xll6yQsg7UEUOTTv+oRohxeSr1ZKMcxTcSk4OltvSYF9y3Eb8xzKZZgTLP 3RwEcuhlcAZzvQ7Hsk5RRVG4AnMU2vufTD16lZ39kfbv+l67hSWs18t0txF4Bw== 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 4V1p882QjTzc0s; Sat, 23 Mar 2024 05:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42N5jiAI047027; Sat, 23 Mar 2024 05:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N5ji7i047024; Sat, 23 Mar 2024 05:45:44 GMT (envelope-from git) Date: Sat, 23 Mar 2024 05:45:44 GMT Message-Id: <202403230545.42N5ji7i047024@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: 15bfd7cf2789 - main - soreceive_dgram: use M_WAITOK when we don't hold any locks 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 15bfd7cf27898b5d34e9fa08c10f9cc69da05977 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=15bfd7cf27898b5d34e9fa08c10f9cc69da05977 commit 15bfd7cf27898b5d34e9fa08c10f9cc69da05977 Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-23 05:44:16 +0000 soreceive_dgram: use M_WAITOK when we don't hold any locks --- sys/kern/uipc_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index b70864cbf2a4..196461f645ce 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2869,7 +2869,7 @@ soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio, ("m->m_type == %d", m->m_type)); if (psa != NULL) *psa = sodupsockaddr(mtod(m, struct sockaddr *), - M_NOWAIT); + M_WAITOK); m = m_free(m); } KASSERT(m, ("%s: no data or control after soname", __func__));