From nobody Fri Jun 21 18:21:57 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 4W5Qg93ksFz5P5d9; Fri, 21 Jun 2024 18:21:57 +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 4W5Qg93GqPz4Jlt; Fri, 21 Jun 2024 18:21:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718994117; 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=jWAJvdGrLjG6YexvjChIZ00sHdCGtfJ4CQx5YK17X1A=; b=sYQiSDvD6J760+YluHgeevHZuQ2O5RvcreksIC6BUlUShHq6t5t2QqmX2zTqrSCGYj0tH9 2H/bD0JQR8/8cyP5h8Of981Se8CSM6/0+2fkwhXOsyaCdMCTAzGn5uN2sqDyFWHC80q08f XlVFyFIlFTbDagjHN9nV+ePTLrJgPGSVTRGySNhAAvndunSV8zS+kB93aaOqXm54m8iAxK DXiN1tcuYNJD5DYwMQFuzeWyGMkk1kZMt0tSUUyi40V21CDT/+cbPi3gRq7FlwV7M01YRf MBK42omlD+Ij2MHrPqtaucVS1zT8BzVzIhFdDOYIi9zJu4czoWFxXIN1CPaR0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718994117; a=rsa-sha256; cv=none; b=l19vFjHVcYcQAOLyFT9o7pZIstHmwnecB40QyGLiialhTNRgKmn9kWyH9dhOrYo8kc7DUS dSNS1ShN+u5MY0C2QKPXjkQmF/YKKuqJbcHQBvB3FVc4cD6itr2tJgLvpC1DyAhutZ4K6N cSio2rseFkTAbDqmB2rZ75U3tYSF+BsxsIswFdoczyMWk1HAflPk7HNHzbOvmD7Y6+N7md EaSGkGuaTpHxKU7/itiJ/rMehTSG1UaEk9YfTCrLsaulbTcPeDJJF7lpPFeeXIvDYbM0te RUsHibt5b+hnTImsSVvVyZTe8nBuDtTP+Lmm/ijCJKx5CPt4n+s9bVNfZYo9Lg== 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=1718994117; 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=jWAJvdGrLjG6YexvjChIZ00sHdCGtfJ4CQx5YK17X1A=; b=ReSMRhU+zIEkoSPYBBtlCVohZNuQe4KrwUUSOk0ExLspvx1WD5xG3ilUAWmSFzxFyBBlHz HAePoUXcwjtLnA8kMqD6HS2B+zm5cy/AZP314e/JpV/BAPhFsLHyKgkCnD0jcuy6g41lBS V97U5EowNY/5i+LsAO6LracC98xOFjJz9nE38mCMFDS1rnl7+Ruworg2TAnWtlp8EDn6Pc kIGwQC1TeDRBxqKELI5kngXUb7a9KpVfpoJvr9FSdP34U850dJ0DbbZAhNT1DQElkCsHM4 pXrcrzQYdUfLImjJk7RuGCRCEo3fkE6GGemOfbY7Zya7IvPOc/fJJBMXQhfhjQ== 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 4W5Qg92tHvzJhP; Fri, 21 Jun 2024 18:21:57 +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 45LILvWw052601; Fri, 21 Jun 2024 18:21:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LILvWH052581; Fri, 21 Jun 2024 18:21:57 GMT (envelope-from git) Date: Fri, 21 Jun 2024 18:21:57 GMT Message-Id: <202406211821.45LILvWH052581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ac52fa1f1b97 - main - sendfile tests: Fix an error check in tcp_socketpair() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac52fa1f1b9768d281b9deed6d1158f43a8564ca Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ac52fa1f1b9768d281b9deed6d1158f43a8564ca commit ac52fa1f1b9768d281b9deed6d1158f43a8564ca Author: Mark Johnston AuthorDate: 2024-06-21 18:18:22 +0000 Commit: Mark Johnston CommitDate: 2024-06-21 18:18:22 +0000 sendfile tests: Fix an error check in tcp_socketpair() Fixes: c368d3f20fc0 ("tests/sendfile: factor out tcp_socketpair()") Differential Revision: https://reviews.freebsd.org/D45598 --- tests/sys/kern/sendfile_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/sendfile_helper.c b/tests/sys/kern/sendfile_helper.c index 703b04fdea6c..6365531e312c 100644 --- a/tests/sys/kern/sendfile_helper.c +++ b/tests/sys/kern/sendfile_helper.c @@ -84,7 +84,7 @@ tcp_socketpair(int *sv) if (fcntl(sv[0], F_SETFL, flags) == -1) err(1, "fcntl +O_NONBLOCK"); - if (connect(sv[0], (void *)&sin, sizeof(sin)) != -1 || + if (connect(sv[0], (void *)&sin, sizeof(sin)) == -1 && errno != EINPROGRESS) err(1, "connect cs");