From nobody Wed Oct 12 07:17:13 2022 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 4MnP9P3KHTz4fcpM; Wed, 12 Oct 2022 07:17:13 +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 4MnP9P2r0Yz3RGJ; Wed, 12 Oct 2022 07:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665559033; 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=AZzcSeKvW+be5l1uY9x6w8csBfe/u3GDNzByYphVupE=; b=VNKhWDS1ohcqGCvJkc/iLkDjl96EPXrLFlQjSvNMu3wRpJ60MkuMhaXAbD6WjgDNYPVDf2 tq74sj1jmnlN4qT1/TgX8KwbYuRrYZPXwCJmIRTSixJV2n0nV5P40cP1oaOREUZYNIfPqr aXbXW3ZYNFbqkLb4pROVoLA/XN2ZF/nJDwJvCfv4VD2JofDcTmIF+At9sX0boux5mG74Yf JuwLUTJt7e8OPiDf6JmoppNfr5myIBrbF35ez9fcOemmWd9I4oiPSEDWokdfPcryuE2HKR Y27kEO+5YNIQ7v50XE6/l6kqpPapuYjxD7a3iJs/zsamU4M6JGxGcYZySBiEKg== 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 4MnP9P1t2Vz1Dsy; Wed, 12 Oct 2022 07:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29C7HDpS094610; Wed, 12 Oct 2022 07:17:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29C7HDij094609; Wed, 12 Oct 2022 07:17:13 GMT (envelope-from git) Date: Wed, 12 Oct 2022 07:17:13 GMT Message-Id: <202210120717.29C7HDij094609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: bc0d40767636 - main - Revert "listen(): improve POSIX compliance" 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc0d4076763624df7c3ab35862bc571a3cf80748 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665559033; 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=AZzcSeKvW+be5l1uY9x6w8csBfe/u3GDNzByYphVupE=; b=EZW0OYLp1EKWCja2BNTV0FcI/CLyde6z7f7fGv3a36LXq9X3hadlHZ3WT9BxK2sZdZN6Yb 1ctW2+U3YYvupdkMvy+5ev4i5TsnMdScsppWHbLUm+QStiA87PaExQbzGesC7EhJtwTNgT CkOAF32cczx6BfsKj5ZPZaEH31LBvH2IIg5FTDE8f6+PqV1LbLdcxvohqmxxu4/sJqUX5n gE/djkLQ/AHku90lsYl8oDqQK76FApDK2Y30MFmC7D46W+1kl5HWbcIz533q2ufyNooOJj QFEeYd+rsfMbg/DLixqT2PBGG/iGTNDC0cjZiAZQG0L6eSVWtWd0w4ho1auLzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665559033; a=rsa-sha256; cv=none; b=NJLaIxnin2z//d+ehPS32CLUyGY2xFmy7fPWv9GQDINSpzaQm6TYza67SCBEqw/NyebtIr EKtNjhv8NzgW8rzEieSpoKmeuZWXzrs49n/M91BxOBfrCRAVxnnBrR2/BlhQrusUvEG1gv JcdBlgo+yPzRmkMXq/f1uBThH+MBrClvEipk6UfzOvRkdlfOxRIfo3IsZGHPKM8C9n7X6K pxy4C0Wf3UnVRNKcqh4ZmR3xZ/19evAiDaZai6DYK1P+e6j3HThnTVI/7iMFT3A7kd9R1Y ejAyG64+nEs6CRZP6GsJPPjtzJJ6lI9jXcZvi+jJ1lEfQhuLOQNmkRlcq/l7LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bc0d4076763624df7c3ab35862bc571a3cf80748 commit bc0d4076763624df7c3ab35862bc571a3cf80748 Author: Michael Tuexen AuthorDate: 2022-10-12 02:33:00 +0000 Commit: Michael Tuexen CommitDate: 2022-10-12 02:33:00 +0000 Revert "listen(): improve POSIX compliance" This reverts commit 76e6e4d72f8d3da7d19242f303bc95461fde7fb9. Several programs in the tree use -1 instead of INT_MAX to use the maximum value. Thanks to Eugene Grosbein for pointing this out. --- lib/libc/sys/listen.2 | 12 ++---------- sys/kern/uipc_socket.c | 4 +--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2 index ad4d6edf228f..4d0962fd412c 100644 --- a/lib/libc/sys/listen.2 +++ b/lib/libc/sys/listen.2 @@ -28,7 +28,7 @@ .\" From: @(#)listen.2 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd October 11, 2022 +.Dd April 14, 2020 .Dt LISTEN 2 .Os .Sh NAME @@ -106,13 +106,10 @@ specifies a hard limit on .Fa backlog ; if a value greater than .Va kern.ipc.soacceptqueue -is specified, +or less than zero is specified, .Fa backlog is silently forced to .Va kern.ipc.soacceptqueue . -If a negative value is used, -.Fa backlog -is silently forced to 0. .Pp If the listen queue overflows, the kernel will emit a LOG_DEBUG syslog message. The @@ -194,8 +191,3 @@ The original is still available but hidden from a .Xr sysctl 3 -a output so that existing applications and scripts continue to work. -To improve POSIX compliance, a negative -.Fa backlog -argument is handled the same as 0. -This was introduced in -.Fx 14.0 . diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index ff2ecadfb22a..7e1d2c910dbd 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1075,9 +1075,7 @@ solisten_proto(struct socket *so, int backlog) so->so_options |= SO_ACCEPTCONN; listening: - if (backlog < 0) - backlog = 0; - if (backlog > somaxconn) + if (backlog < 0 || backlog > somaxconn) backlog = somaxconn; so->sol_qlimit = backlog;