From nobody Fri May 30 18:52:27 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 4b8C6C4n3Jz5y0qR; Fri, 30 May 2025 18:52:35 +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 4b8C6908lvz3G8N; Fri, 30 May 2025 18:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748631154; 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=kurWQAkt7etpwlTx/9OfIhoS05OCMSJbahLyc1ITIyU=; b=RN4j8mFqRsN1dsd7SAuLT5v6EH255p/7FM8jhniVlqHu/1FDsuJsqXRyigad2u5hbQoWI+ KH0Yt1XCPjna3DW/W6lxRF8vBROnS7fvPlKwh4IjkrkI5L5zO58wsV9QeuSYU8AhkAdPrM u7WsxjjQKPoc0nREeCoKNmrJgEARpoiIMAQBzySEK16dJei2BoYFWzZR8sDdk0Z61vvs89 vdZdiUmYvJv5pHAJdWjV7763i9KnG1HRevkUBFYZUjJSWEM9LWHlmM4CE5eh3XXPAcYHV5 nN6hjlT6Pif4b+Bfau801mizQqbq4ewyp1S6trcss4na/AO5PM+U84ROY/0PAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748631154; a=rsa-sha256; cv=none; b=SJ+yhkvozKh17dqLbzFygsl97eJD0z0I5ERSUjzo9eQxvQ1PgPv94fkSrA95Jz0gkzSoNc jlQU2duqwxcG7/1wi3Vu9pJY++cGaXufZRIuyhCZHCFO/3G8F+LHPaCiw7ZJB1bCPNKAkW EYRrsmd/NXdSrF1kA382S1CSFPodmebBR5UKZ8uvQSpi3l28QeZZTqoKZLR/csLwg9l/QN RZzndmIXLiDaGRX5Sw/OskqfOY75X8kxLwqY8w07Z5z1EptwD3//cpDkQ02ctm2R1KkEt4 rPt0UhYj9eDcC8Ta++ggtl11ALkbXDF3ifl8PUiLpeRvVKuOaa0jvHx6gHFdfw== 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=1748631154; 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=kurWQAkt7etpwlTx/9OfIhoS05OCMSJbahLyc1ITIyU=; b=cJ/XfaoOwvry/NEM3Fsdff7z0umN6Q2dLEtZeoJ0dRnB6MVAOB8rJLvhz3Suz8KSTqGXb4 avAlOwOXk/j0x9Iq2EJuzSQSB1KsHNKoDD1Stx+WBbjW+lR6gBRLWbOe9J6Ifeq2nonMPS SF+ko2tALTjRuPom4BVbifG/6b9TRQRLVaVaL+g1W1nAdueoihcSxKAY39d4aQYxcaMmsz 25jC2AQ4cl3nxJUbWPQAZ3RhXqCvCD1ED3r40D3f2nTWW9f4vagZ+Apq3Jj9scMWCMHmpH 5n4h2p59I4YkbWvOATeYruW7FWr9Xrt+JIKByrKkgr/1ByvpGWi+ik4QBBEl6Q== 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 4b8C632hCFz13wl; Fri, 30 May 2025 18:52:27 +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 54UIqR2N016314; Fri, 30 May 2025 18:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UIqRfQ016311; Fri, 30 May 2025 18:52:27 GMT (envelope-from git) Date: Fri, 30 May 2025 18:52:27 GMT Message-Id: <202505301852.54UIqRfQ016311@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: 6ac71c4a5234 - main - unix/stream: fix poll on a peer shutdown(2)ed socket 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: 6ac71c4a52348fc2e47d7d4a5c06c5ffc45660f3 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6ac71c4a52348fc2e47d7d4a5c06c5ffc45660f3 commit 6ac71c4a52348fc2e47d7d4a5c06c5ffc45660f3 Author: Gleb Smirnoff AuthorDate: 2025-05-30 18:51:04 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-30 18:51:04 +0000 unix/stream: fix poll on a peer shutdown(2)ed socket Add missing poll events mask that was lost while refactoring sopoll_generic(). Reported by: kevans Fixes: d15792780760ef94647af9b377b5f0a80e1826bc --- sys/kern/uipc_usrreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index c411f22970e7..95d857b2625d 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1685,7 +1685,8 @@ uipc_sopoll_stream_or_seqpacket(struct socket *so, int events, so->so_error || so->so_rerror) revents |= events & (POLLIN | POLLRDNORM); if (so->so_rcv.sb_state & SBS_CANTRCVMORE) - revents |= events & POLLRDHUP; + revents |= events & + (POLLIN | POLLRDNORM | POLLRDHUP); if (!(revents & (POLLIN | POLLRDNORM | POLLRDHUP))) { selrecord(td, &so->so_rdsel); so->so_rcv.sb_flags |= SB_SEL;