From nobody Sat Mar 26 10:17:59 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 0CA861A3820E; Sat, 26 Mar 2022 10:18:00 +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 4KQZfH6KRCz4b6y; Sat, 26 Mar 2022 10:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648289879; 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=n0nKjqRWykcEIN5JGenxpR3HJobZSUi8J9CS26J0qVQ=; b=kjZLy6R6JWVOkKeQoWyaSvhT5RGq/KzTp6xeZAgG5ucqMsMV2rjqNE7A5697fRD4pgH4BQ /sZD5APVe0dgGHnob2f0iEaBlMiWQ4HBjMtt1Qyb/JrX2y8t/g/yzwHGJy41hlOz9J7HZZ 2fKtj/9yg5eSL+RaP3HofwmgpVELL8Gy9lJIW3I20jr7aEFy23Zm6ELCPMqAcRVIdcqaMG v4UN709lKIutPvbk7RnrJvlfxxBF1fMnz5PnEXzvCFA/k9r3Hoxw/QK5A0r031HQMeZGye ZPjW/S49NmWhEMNbclmnxqWuURwfjd2MH+EakxEsor8AEXqrRRFg8XwMGeIl2g== 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 B90021F2A8; Sat, 26 Mar 2022 10:17:59 +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 22QAHxLg092776; Sat, 26 Mar 2022 10:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22QAHxQe092775; Sat, 26 Mar 2022 10:17:59 GMT (envelope-from git) Date: Sat, 26 Mar 2022 10:17:59 GMT Message-Id: <202203261017.22QAHxQe092775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: aeb91e95cfc2 - main - Log euid, rgid and jail on listen queue overflow 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: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aeb91e95cfc2d86e6f5eea4114247d2987ba06b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648289879; 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=n0nKjqRWykcEIN5JGenxpR3HJobZSUi8J9CS26J0qVQ=; b=x4r/k/Dtih1UHD8EUYoa0yEQ+TgmSSzGiKdMyAa6cJN6AQh3YEIP3cN0yig0mKVcStJJQN iZO9DP5sSvOaI5h/mLGfeHF1UzFmd9iNjbNlTHlJ9rufrNjkbITtActn/+KccYDrmkcQ+H nNCvOCdfUbQDV7J08BozKnlak5DKZlAgNn1ti1Li4IfUa/PK+87oGYrBQc2BZ7ZiuIuZvp ed+cMVjIS1D5yvLRrad5rcbz56M4l6JTASBF97gSXMhUxExQA2no6wpkliN0fKrmh6qMTw cJzSNgQG1zErOEe57EQI9e1s3L8xEyCzDa/DyxT2bV7H/dSDTiQRejivh/rXXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648289879; a=rsa-sha256; cv=none; b=Jp/zdIAZa542f/1qm+cYhkb/eSeTHJVQ4QDbbWv8yAa/BKtX747yN5KA0hGq/gKw+PoSmq 8QDfkhHNEvx+52yFUFjdcRZ+bq/rOqu2abLkpJR5/u6C/NdvlPaJOUunk8j61twwsJm1pp O79ZaDQd8qK53lw+WQkArpgIbdL0DGPNxk2l5rJmPb0jJOdGI03W/CdsDYEHCiyGmsrQQt gqltqm7rwVQcRod+IGfLHgnjvAr1CsuIMRRbXYQZy3ek34b7gC+zDYPRYcmopgE/+TIX4y RN1KEr6D/yF1CJa4nuqj2TGtsb3i4Dn6SkzumZtw1+DeKCwtW1NpwzJp7QE4GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=aeb91e95cfc2d86e6f5eea4114247d2987ba06b6 commit aeb91e95cfc2d86e6f5eea4114247d2987ba06b6 Author: Alexander Leidinger AuthorDate: 2022-03-26 10:14:16 +0000 Commit: Alexander Leidinger CommitDate: 2022-03-26 10:17:55 +0000 Log euid, rgid and jail on listen queue overflow If you have numerous jails with multiple similar services running, this helps to narrow down which services this log is referring to. --- sys/kern/uipc_socket.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index ab8e5d6e1b69..4c4fde0d6a26 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -699,12 +699,24 @@ sonewconn(struct socket *head, int connstatus) } KASSERT(sbuf_len(&descrsb) > 0, ("%s: sbuf creation failed", __func__)); - log(LOG_DEBUG, - "%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); + if (head->so_cred == 0) { + log(LOG_DEBUG, + "%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); + } else { + log(LOG_DEBUG, "%s: pcb %p (%s): Listen queue overflow: " + "%i already in queue awaiting acceptance " + "(%d occurrences), euid %d, rgid %d, jail %s\n", + __func__, 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"); + } sbuf_delete(&descrsb); overcount = 0;