From nobody Fri May 23 22:52:52 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 4b40mj3vL9z5whxC; Fri, 23 May 2025 22:52:53 +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 4b40mj0Pc0z3svm; Fri, 23 May 2025 22:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040773; 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=qCNeiO25FW9X3NL6BT20cm6h7bSnHORaIWJeUw48veM=; b=q5ZNRqhmJl0HwkuFVekiJ/B6c2MvjeKlPKzjdQDEMdEjXIjpnUf/4ao0BHwSLi0wpxWPyk T88RnUABTXvhLQcTpc+7qRPA5EyqnEtT7sYaWtK7UrLanOn9yMHEQB5MiLtCakvWq18Ec7 SQz7iMDIwQK3rG2D6/29kF3KQKf8g1BJnF3jOsSeSwedDobDh6JDKC1bm3A21Kx2wxdvSS GkK+a1dd7UCXNQYskPhepu21V4fWVBoIQDu/kWakVBdpsW+a6KaPRnVBVJ4NAiHtv+AiiG WSIRDPV7LGDG29QPq25m44p1nj/q5SaMsSDQU+q8gh9ww5VWyFoiDhQrWVEkMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748040773; 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=qCNeiO25FW9X3NL6BT20cm6h7bSnHORaIWJeUw48veM=; b=xEgk3IezVepBiKiPK9O1wN/MjiLSpWFIbmgZwZ0s7hTADyGz9SSvGJ6V1X2HRIhQz9VN/Q 4bbMf0GEZ1t4CfZ/3GdloEBiI1p/ebjcxB1ceIz7FWaIo03qowFr4cIhAP9EBghSmeiXoX ULedbLnjd4bAzgWXgmE3POAMYxuhSZzETYnF5Fl04lbmHlZ/WFkNsr07kpwrP+68h0kZKw qh/qox+xoZSYBTsPEm07FBmKbjkZuvBnGuecYy4qkkUXt61XGboPrpOVdHtirhbQkzRYNx BLr256hwNdbZquyW8B50kop5eOVRbZH/a+onwm4AbZn5fik+eCgQo2SAn8nG9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748040773; a=rsa-sha256; cv=none; b=WghNRfPlS4Ay3PSACs3VtZBpHZhePgAJlfq7dePmA2XkfeEuwwt8mFDS60ECWqr0CKlm2U 0c1KGU1E2DZai9FRJ+d6+gGIYfgoZYqqOGYiZElmykpP/vptF+RR4X4tbOsmmDVna4mD/u VFj4iq72Npo90zC9ip42RM5UFZvJb8EhuryPyBmS4vKybRFYkAUd0WNnIMghZyfbCQEZtA YkJupy+823SxIv8Tcd/VA8xrJDqmDddtu61jfXciqYicEJaAuiN02mutl5AMdoLYdFf+YR kc2aUt8YTMTNZArWWETeTn2GlOOy6VnwGcYc+6z+vCgKrXCgBWVzPN/Qg55edQ== 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 4b40mh6lCmz1NrH; Fri, 23 May 2025 22:52:52 +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 54NMqqKG050732; Fri, 23 May 2025 22:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NMqqMP050729; Fri, 23 May 2025 22:52:52 GMT (envelope-from git) Date: Fri, 23 May 2025 22:52:52 GMT Message-Id: <202505232252.54NMqqMP050729@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: 46c644620117 - main - tests/unix_seqpacket: add couple tests for shutdown(2) 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: 46c64462011716213f15c20b1c027cd85cb8bd14 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=46c64462011716213f15c20b1c027cd85cb8bd14 commit 46c64462011716213f15c20b1c027cd85cb8bd14 Author: Gleb Smirnoff AuthorDate: 2025-05-12 16:32:23 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-23 22:04:38 +0000 tests/unix_seqpacket: add couple tests for shutdown(2) - A test against recent syzkaller discovery. - A test that remote peer shutdown(2) will unblock our recv(2) --- tests/sys/kern/unix_seqpacket_test.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/sys/kern/unix_seqpacket_test.c b/tests/sys/kern/unix_seqpacket_test.c index 058c931163a1..b9a6be015241 100644 --- a/tests/sys/kern/unix_seqpacket_test.c +++ b/tests/sys/kern/unix_seqpacket_test.c @@ -894,6 +894,38 @@ ATF_TC_BODY(shutdown_send_sigpipe, tc) close(s2); } +/* + * https://syzkaller.appspot.com/bug?id=ac94349a29f2efc40e9274239e4ca9b2c473a4e7 + */ +ATF_TC_WITHOUT_HEAD(shutdown_o_async); +ATF_TC_BODY(shutdown_o_async, tc) +{ + int sv[2]; + + do_socketpair(sv); + + ATF_CHECK_EQ(0, fcntl(sv[0], F_SETFL, O_ASYNC)); + ATF_CHECK_EQ(0, shutdown(sv[0], SHUT_WR)); + close(sv[0]); + close(sv[1]); +} + +/* + * If peer had done SHUT_WR on their side, our recv(2) shouldn't block. + */ +ATF_TC_WITHOUT_HEAD(shutdown_recv); +ATF_TC_BODY(shutdown_recv, tc) +{ + char buf[10]; + int sv[2]; + + do_socketpair(sv); + ATF_CHECK_EQ(0, shutdown(sv[0], SHUT_WR)); + ATF_CHECK_EQ(0, recv(sv[1], buf, sizeof(buf), 0)); + close(sv[0]); + close(sv[1]); +} + /* nonblocking send(2) and recv(2) a single short record */ ATF_TC_WITHOUT_HEAD(send_recv_nonblocking); ATF_TC_BODY(send_recv_nonblocking, tc) @@ -1310,6 +1342,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, implied_connect); ATF_TP_ADD_TC(tp, shutdown_send); ATF_TP_ADD_TC(tp, shutdown_send_sigpipe); + ATF_TP_ADD_TC(tp, shutdown_o_async); + ATF_TP_ADD_TC(tp, shutdown_recv); ATF_TP_ADD_TC(tp, eagain_8k_8k); ATF_TP_ADD_TC(tp, eagain_8k_128k); ATF_TP_ADD_TC(tp, eagain_128k_8k);