From nobody Tue May 30 09:29:52 2023 X-Original-To: dev-commits-src-branches@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 4QVnDJ2NkPz4XBWp; Tue, 30 May 2023 09:29:52 +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 4QVnDJ1tjPz3srN; Tue, 30 May 2023 09:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685438992; 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=gZ+8+ydTHU/KzuC6C+m47paryMBGj0v1F2Ie4Mh4yoI=; b=DjxHM9yq9+VrvTWUJ9I4adkZkcMv/jhCwDWgT6iuETicBGBgFSXHMDYe0edIL2ZHjxiDhQ DmlIuRZSrJkxYrfatytxbVGma3QoaQ78te7dUNuyYBFovA8WGuyQbeM7zmaas9hQ4SnOCl luAwIE9grlELlqJ/eieUB4b2kjh4+YByujkDE4kFAnnTUfZi1hJ0EGDyA/dVBAjyn+CuRU 38UiC1LwLwBprpTCnGRNkPxqqYxB6P5+7P7/8aZ4m/UrKEVSNwcDb/5w2WHYf1i41pXP6n aV++/mkUIUy1/ef4NN2fe3sCzOYQhDBXzpncdjBj1z7nS/BmELVARkc6LwzZKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685438992; 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=gZ+8+ydTHU/KzuC6C+m47paryMBGj0v1F2Ie4Mh4yoI=; b=N4F1vSsYRTjcxk5X5QZ0qPuVVdCYTqUs3MFQrAHhQwuvxvoSKRKd5O+6zbq6Y4TIcn9hFN vUSsFJcDZ7nSEMrBvG8gzlLsCa3CnUYhiLtOOEUAhnMNeI91aYDSTrDh0cObSQkN+Rh2oN IyP/tmulMRQQZOfSnl+AX4qHwISLoqlmL9NOCcIwSiS8iBIOt/pgiVsqRGRRZq5lj+ldkQ IhVSR04BkH3Sx8XWtznDvAhx24SJq7MMVYQ614Cm22+OAPms83UZrtDGfZyvsPEnqwNg9I LkQ1Pp1q8kYdZSdT4c81GTGKbT5bqu4vyVwSenTpprtz76Isab+QKgbMP2vPsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685438992; a=rsa-sha256; cv=none; b=n6L9NGXuYJTf1MQp+kMIbpxt73h1sBTMvU2jb/vA5oYgP8CmlGm/NO4vdlBlUEb+1/VS62 dYZNgIXxGuoSPFiH6RkrNqNKmObU0yiXzAqZWXAn4xnR8SXroMCBERzmXINUzd5GzzrdsH 98XxBQdITWChFMeZmHxaqcK63NSL7F5iZzcZatr0ixEqohnL3LuYO1qPXTIcyHj4BDxjXP N+7oCihgJyQqKtV2VOWaM02VHlaYqVOxzhtRjRsjuZJYUNkXIpZODV42b2f4TnCQjf1PA0 Pq0HnMM/oa24w2jGDMUuQYSn8ciGVqjOlHPyT6FkmEtA5RM1PaMbzXEogyAf0w== 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 4QVnDJ0xhZzp69; Tue, 30 May 2023 09:29:52 +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 34U9Tq0N055342; Tue, 30 May 2023 09:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34U9Tqkw055341; Tue, 30 May 2023 09:29:52 GMT (envelope-from git) Date: Tue, 30 May 2023 09:29:52 GMT Message-Id: <202305300929.34U9Tqkw055341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: c434383146a2 - stable/13 - listen(2): fix wrong MFC List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c434383146a264c396d8bcaafd40507f7bf46e56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c434383146a264c396d8bcaafd40507f7bf46e56 commit c434383146a264c396d8bcaafd40507f7bf46e56 Author: Eugene Grosbein AuthorDate: 2023-05-30 09:27:25 +0000 Commit: Eugene Grosbein CommitDate: 2023-05-30 09:27:25 +0000 listen(2): fix wrong MFC Direct commit: fix wrong conflict resolution in previous MFC: listen(2): improve administrator control over logging Fixes: 773c91ccc8922c047d3632ae5849cd824992c313 --- sys/kern/uipc_socket.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 32ad819be81b..669bddcd629b 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -699,33 +699,12 @@ sonewconn(struct socket *head, int connstatus) } KASSERT(sbuf_len(&descrsb) > 0, ("%s: sbuf creation failed", __func__)); - /* - * Preserve the historic listen queue overflow log - * message, that starts with "sonewconn:". It has - * been known to sysadmins for years and also test - * sys/kern/sonewconn_overflow checks for it. - */ - if (head->so_cred == 0) { - log(LOG_PRI(sooverprio), - "sonewconn: pcb %p (%s): " - "Listen queue overflow: %i already in " - "queue awaiting acceptance (%d " - "occurrences)\n", head->so_pcb, - sbuf_data(&descrsb), - qlen, overcount); - } else { - log(LOG_PRI(sooverprio), - "sonewconn: pcb %p (%s): " - "Listen queue overflow: " - "%i already in queue awaiting acceptance " - "(%d occurrences), euid %d, rgid %d, jail %s\n", - head->so_pcb, sbuf_data(&descrsb), qlen, - overcount, head->so_cred->cr_uid, - head->so_cred->cr_rgid, - head->so_cred->cr_prison ? - head->so_cred->cr_prison->pr_name : - "not_jailed"); - } + log(LOG_PRI(sooverprio), + "%s: pcb %p (%s): Listen queue overflow: " + "%i already in queue awaiting acceptance " + "(%d occurrences)\n", + __func__, head->so_pcb, sbuf_data(&descrsb), + qlen, overcount); sbuf_delete(&descrsb); overcount = 0;