From nobody Thu Oct 16 18:50:27 2025 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 4cncTb5FQZz6Cxp6; Thu, 16 Oct 2025 18:50:27 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cncTb3LhNz3GMm; Thu, 16 Oct 2025 18:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760640627; 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=1/uEZhFi6Eyo5iHs5EzyH1a+8Vi+77Wk944WlXgC57U=; b=he1HmkW6Gi2qsRSetFd8RUz6kSc9UZsqSOjhXO0RTjTaYyzrK54+gFNUVk8C7Dj6dmt8wb qRDTgscxOFenn/ZlpeML2Se7LXLySVa9lZYj9tDZgQ2AOttpdC4YIVJf2Cvd0CyUMH+dPH tUzWH7XFc4G4wjkWuHf5kAaFEX661ZSCKHtkhMAbkppgvENFlnniHHNZrUcHG8Uij/Xcc2 q4bEMg/KU6JV2UwgBTsXKttsmSi45JXq5ktjKvsK7h9QSefK3/57ZRNnnou8W2WI/N7vgQ SQ/QcCm9VmYnvBOcpeqgeJSnH9fKsA7bwCUMMlGfSr4XEupb5oT7maDo7K4ZZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760640627; 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=1/uEZhFi6Eyo5iHs5EzyH1a+8Vi+77Wk944WlXgC57U=; b=TQosKrTP6U8deWMe9r69fw0Mxc/qB3NjdLCavi2yv9IqymJWZ0m1CzN6x+TZEH/27bdfZg HmmMLlZ6mc3QtBtVCGnKIbzGX8+/UyNJdIIOJWug2uAaHP0NWawghkmdaLuoppvsd0Qmf/ qIQOXVVOdldM4MZO+7X6Xy9JcYI00deYDH1LHQnV5gKFh6Q6wPuU2b7j0e5Ol+F1xb7tqO w5vMzLfG+HMmHzSL+G0Yuy9kU/e+DEdK7Wb3XL70NaVlPqAyvI7GiXKwZGGvDLNQNfUO/k a5UCh2hRSREY7v9KDawMnsiG/AES9soKYpM6XQ+2b1vk0xwN/bhRG+8WsPvQSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760640627; a=rsa-sha256; cv=none; b=Lfi796Rh/9H0dwEBQP5cIkmOwBaRIUxMz79sWOeM0oPseQKpJ9CaumNgmXljiG6eak4lzf PG7iWDhnKcVjSst0iXcY+lwPXo44V0Tav4ZcwSsw0fq+Tbq7Dvl+6I7VrRH3Pz/64sAqYI SpHlvAVftSeD/lDdEIg/0nCgfPbBluAW2dW5sPPOwbBrDy7qMl7+JNLzk4gJRrixvaNna3 /dH71vLzWDAIDyE722Q8qgLxu/+gYAhz3JtESdX7FwZ5cr97xEn/eCeWotnWWPVdS+TVxO SfW+l/xUXhyB9Zp0gIJoO/E80ES0R0/1MQnmqUdoF2fpW9kbR+WYvf+6g/uEyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cncTb2v3lz5Rg; Thu, 16 Oct 2025 18:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59GIoR9Q075339; Thu, 16 Oct 2025 18:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59GIoRpL075336; Thu, 16 Oct 2025 18:50:27 GMT (envelope-from git) Date: Thu, 16 Oct 2025 18:50:27 GMT Message-Id: <202510161850.59GIoRpL075336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 77a00e86d64c - releng/15.0 - sys/rpc: UNIX auth: Do not log on bogus AUTH_SYS messages 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 77a00e86d64ce6af066099345cd2f00f9bc2ca82 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=77a00e86d64ce6af066099345cd2f00f9bc2ca82 commit 77a00e86d64ce6af066099345cd2f00f9bc2ca82 Author: Olivier Certner AuthorDate: 2025-10-14 12:54:55 +0000 Commit: Colin Percival CommitDate: 2025-10-16 18:48:24 +0000 sys/rpc: UNIX auth: Do not log on bogus AUTH_SYS messages Remove the printf() stances added in commit d4cc791f3b2e ("sys/rpc: UNIX auth: Fix OOB reads on too short message"). Even if it can be helpful to know why an authentication message is rejected, printing explanatory messages on each request attempt is a remote log filler that could be triggered by accident, and the generic RPC code generally does not do that. These printf() calls should be restored only after some limiting or configuration mechanism is devised. Approved by: re (cperciva) MFC with: d4cc791f3b2e ("sys/rpc: UNIX auth: Fix OOB reads on too short message") Sponsored by: The FreeBSD Foundation (cherry picked from commit 2110ae0ef9d6ca8cf52b29fcaf926c4343f56826) (cherry picked from commit fb8a978ebfeb5522123e3afcbcd5dc36591dce31) --- sys/rpc/svc_auth_unix.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/sys/rpc/svc_auth_unix.c b/sys/rpc/svc_auth_unix.c index 9e4b0b8483b5..aa0fc585865f 100644 --- a/sys/rpc/svc_auth_unix.c +++ b/sys/rpc/svc_auth_unix.c @@ -41,7 +41,6 @@ */ #include -#include #include #include @@ -70,11 +69,8 @@ _svcauth_unix(struct svc_req *rqst, struct rpc_msg *msg) const uint32_t min_len = 5 * BYTES_PER_XDR_UNIT; uint32_t str_len, supp_ngroups; - if (auth_len < min_len) { - (void)printf("AUTH_SYS: Too short credentials (%u)\n", - auth_len); + if (auth_len < min_len) goto badcred; - } time = IXDR_GET_UINT32(buf); str_len = IXDR_GET_UINT32(buf); if (str_len > AUTH_SYS_MAX_HOSTNAME) @@ -85,12 +81,8 @@ _svcauth_unix(struct svc_req *rqst, struct rpc_msg *msg) * 'str_len' (and that it won't cause an overflow in additions * below) to protect access to the credentials part. */ - if (auth_len < min_len + str_len) { - (void)printf("AUTH_SYS: Inconsistent credentials and " - "host name lengths (%u, %u)\n", - auth_len, str_len); + if (auth_len < min_len + str_len) goto badcred; - } buf += str_len / sizeof (int32_t); xcr->cr_uid = IXDR_GET_UINT32(buf); xcr->cr_gid = IXDR_GET_UINT32(buf); @@ -108,14 +100,8 @@ _svcauth_unix(struct svc_req *rqst, struct rpc_msg *msg) * read in total. */ if (auth_len < min_len + str_len + - supp_ngroups * BYTES_PER_XDR_UNIT) { - (void)printf("AUTH_SYS: Inconsistent lengths " - "(credentials %u, machine name %u, " - "supplementary groups %u)\n", - auth_len, str_len, - supp_ngroups * BYTES_PER_XDR_UNIT); + supp_ngroups * BYTES_PER_XDR_UNIT) goto badcred; - } /* * Note that 'xcr' is a 'struct xucred', which still has the