From nobody Tue Oct 11 21:55:50 2022 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 4Mn8jf4b2kz4fW5Q; Tue, 11 Oct 2022 21:55:50 +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 4Mn8jf43XRz3WkR; Tue, 11 Oct 2022 21:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665525350; 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=QTypMqBulf148K62WwJUszJ0MnXLFnN6cajzBGgW42Y=; b=VIIRAJC/FeIhDbLcfyCfgdxc7fxVwD+A691OFD65CjexAS/MJs5KyWArHdLaViOnIj7mLP HPMJItHHLVaMk7HlJ0GgdFqgsAaG/BtDcKV2AgyUYWEiZCApcCswsKIrmgiJzb9TkQWOvv Ewdhm2jJpmaUWkMoWIFj+8QrRiSQPw1vn69bTctl70myRSUUvHy4bkVrMyHByeDq84t/gJ nZxt7z+cM8gmNXVvIjMeQgcVGfMS6rAOEVAYmwI1+q8nGvXsmWYukj7ExGS2g6LecnRuTh FltOON+OUuFOVerPhUgWiHb3FQtsYyKk//AXGqvPe9nx+17nZa8HYawnLaeAyA== 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 4Mn8jf2qqrz15pt; Tue, 11 Oct 2022 21:55:50 +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 29BLtoml099097; Tue, 11 Oct 2022 21:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BLtoe3099096; Tue, 11 Oct 2022 21:55:50 GMT (envelope-from git) Date: Tue, 11 Oct 2022 21:55:50 GMT Message-Id: <202210112155.29BLtoe3099096@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: 76e6e4d72f8d - main - listen(): improve POSIX compliance 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76e6e4d72f8d3da7d19242f303bc95461fde7fb9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665525350; 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=QTypMqBulf148K62WwJUszJ0MnXLFnN6cajzBGgW42Y=; b=fdWAxQoxcjEUo/pZPz+fu0/53r45qlAHxgtqXN9Y7bO1LB5QY4oaWQ6gsgkYA8tAZohdRS tWPw4mUrsR9AzUaDXiCSVNKuBwBTy97X3/E0EA5MhlWhjT+qRQrisRXzo4CRkoGgmWAykK zDkKxj9Bupj+u45vouGUbKE0ed3Kdru4l9Yqe1Px3bIL52ldmOP/F90CwRjQwmaoNnUFax ojRtxgt073t10lUbfUo65cTmXZvnIyZaZMoZokKDLsZPoFaw65/vSbA/sgzL2FBU7bHA6x YMv7HcE1kiRJpS/TlgsbTklL+KRXigGGoQSxQY6rhgCu5fsAJZ6edhvciJ7JHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665525350; a=rsa-sha256; cv=none; b=jjFXv92mvMy/In5Wb+nQVI5h9SP8Gno42k+BvgkEbGamP9ZCkXt81hAwJsWViq19fNqlIf yoCfz+3MfHcbh+y4m2e+WBtJrTXRxNX7aYnXDVJWt+Kd7b/8VyF0bmVr47nVymJG7519Gm rRI2dLZSuUPNDiGpedJI4i/tSVm/4BtRPQHmCDNn82EHmjUCkvhqM9HlJSvJ3rCh7QBn6b k3Pgg6PVhY0IFj6uTKsnpHaidMYqLtCJMZz+omEZ/WuRWjj4B8kXHV3yMgjNC7Um/Zgj/f vGuNZs3Vy7b7yLraCEt32LdheTyIWeGwVohd4nIGYtYHZ3dQ+Pyw9rM1yiBxhw== 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=76e6e4d72f8d3da7d19242f303bc95461fde7fb9 commit 76e6e4d72f8d3da7d19242f303bc95461fde7fb9 Author: Michael Tuexen AuthorDate: 2022-10-11 20:46:51 +0000 Commit: Michael Tuexen CommitDate: 2022-10-11 20:46:51 +0000 listen(): improve POSIX compliance Ensure that a negative backlog argument is handled as it if was 0. Reviewed by: markj@, glebius@ Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D31821 --- lib/libc/sys/listen.2 | 12 ++++++++++-- sys/kern/uipc_socket.c | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2 index 4d0962fd412c..ad4d6edf228f 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 April 14, 2020 +.Dd October 11, 2022 .Dt LISTEN 2 .Os .Sh NAME @@ -106,10 +106,13 @@ specifies a hard limit on .Fa backlog ; if a value greater than .Va kern.ipc.soacceptqueue -or less than zero is specified, +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 @@ -191,3 +194,8 @@ 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 7e1d2c910dbd..ff2ecadfb22a 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1075,7 +1075,9 @@ solisten_proto(struct socket *so, int backlog) so->so_options |= SO_ACCEPTCONN; listening: - if (backlog < 0 || backlog > somaxconn) + if (backlog < 0) + backlog = 0; + if (backlog > somaxconn) backlog = somaxconn; so->sol_qlimit = backlog;