From nobody Thu Apr 25 13:20:56 2024 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 4VQGh9084qz5Hj1S; Thu, 25 Apr 2024 13:20:57 +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 4VQGh85yrcz3xs4; Thu, 25 Apr 2024 13:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051256; 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=3gfZzblpp8cVtv7AWDHokM6vmRG6pXo9YBMAQP9MaQ0=; b=hbR9i8KIfR+OCH2ffcAab7esC3Nnb/YC/CZVutFUMI9S/Swzuc7tQUVLhO/RxcqCwzZEXJ 4/3IbRkIZQk0kszSR5vztGFV0yibsfhq9RDehtLjq/qopXcocjkxafjTWQlGRp+h11rR/j kNa21NmCZFYLUmBZ5gCvedWKOEuJ/CNa7S+LVkkhsvOi/vychQ0CA8nSXhTD9if8qxHozq XXPunPXGowpb+8Rx/IwA+QJnpOOzF37rqvvh9XLjFPJoZfaFLYdT/vVbGDpC8Msjlp+nVW o+0e/WgYGW6tP87XOij912ActPNC5Ywb8eVCaS4+Jdj0qxWZBK0uiRcER0m4Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714051256; a=rsa-sha256; cv=none; b=wXoqQzUeTg0JEJbiiPoV7+S+u0GC0rZ4FB8zCWtn5On9nTwtRU8alT0IyXtpaejbXJIcxD kRROoAO9WaoEdw9h1TDuOpn6t1Q0PpaTfumTFU5EGXJvkV+7u3vLyevjPzPDCH2pFH7Ge3 ljBcPyIkPb0en0Uyo6RC1OSs465X3Rz9E7feyGH0bnc8AZ3j8LZAe+iBtZ5196H3f5m5m2 kQFQAz1oFXNGauAtBboiYiCi6EJYbgDYW9PPJRXQI4Cq1/aSrRoZEhyT8mfaSz3Wi+aUOk RP01XNj9TDLFv//AFL0b4zSOuXmUgRQ0eiSoQ1EgSfyHEiiv/Xcy+77qoIjQJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714051256; 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=3gfZzblpp8cVtv7AWDHokM6vmRG6pXo9YBMAQP9MaQ0=; b=K8TECUZ8vrFE4NY5dW3hWOIGOLehCu2bY4xxkKr0fKKJi/egh2l9p/QpHsxZJjbIlP8srW tknQpiU3EjMHux8FX6hO8QFKkjJErErDb/YD00QTKjpMfB06xLqiqmYWUecj+Hb+QhVvHx eO+ABx76p8RLie8dhbHNmMFwCwLI7uz3/lRl3477Asc6Kp4+AlDH4aFIXHTfBSZkkzoOV4 t8zUEihjpQlM4B2bgeZ0ZMUIS5Q/WfNWrBIN+83XgPv73EV2PS8wfxiH5YyWh4fGewVJUa XmHj+cQuCqpkb3w8R9lR4rBZcxJ0tNoSfZNVcP3U3Y3CtCHuvi1pue9WYVv82g== 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 4VQGh85Zwsz11K2; Thu, 25 Apr 2024 13:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43PDKuqb001782; Thu, 25 Apr 2024 13:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PDKuQp001779; Thu, 25 Apr 2024 13:20:56 GMT (envelope-from git) Date: Thu, 25 Apr 2024 13:20:56 GMT Message-Id: <202404251320.43PDKuQp001779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 32004d854a2d - stable/14 - nfsserver: Rate-limit messages about requests from unprivileged ports 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 32004d854a2d4b2d03e40ba57cd0f4bf1ea6a6b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=32004d854a2d4b2d03e40ba57cd0f4bf1ea6a6b4 commit 32004d854a2d4b2d03e40ba57cd0f4bf1ea6a6b4 Author: Mark Johnston AuthorDate: 2024-04-17 14:36:58 +0000 Commit: Mark Johnston CommitDate: 2024-04-25 13:20:16 +0000 nfsserver: Rate-limit messages about requests from unprivileged ports If access from unreserved ports is disabled, then a remote host can cause an NFS server to log a message by sending a packet. This is useful for diagnosing problems but bad for resiliency in the case where the server is being spammed with a large number of rejected requests. Limit prints to once per second (racily). Reviewed by: rmacklem, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44819 (cherry picked from commit b7e4666d7b69c22699a9299687018a892a5dad5b) --- sys/fs/nfsserver/nfs_nfsdkrpc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index 25f9c05d6f0b..022f7403d28b 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -191,6 +191,12 @@ nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt) port = ntohs(sin->sin_port); if (port >= IPPORT_RESERVED && nd.nd_procnum != NFSPROC_NULL) { + static struct timeval privport_ratecheck = { + .tv_sec = 0, .tv_usec = 0 + }; + static const struct timeval privport_ratecheck_int = { + .tv_sec = 1, .tv_usec = 0 + }; #ifdef INET6 char buf[INET6_ADDRSTRLEN]; #else @@ -208,15 +214,19 @@ nfssvc_program(struct svc_req *rqst, SVCXPRT *xprt) (buf)) #endif #endif - printf("NFS request from unprivileged port (%s:%d)\n", + if (ratecheck(&privport_ratecheck, + &privport_ratecheck_int)) { + printf( + "NFS request from unprivileged port (%s:%d)\n", #ifdef INET6 - sin->sin_family == AF_INET6 ? - ip6_sprintf(buf, &satosin6(sin)->sin6_addr) : + sin->sin_family == AF_INET6 ? + ip6_sprintf(buf, &satosin6(sin)->sin6_addr) : #if defined(KLD_MODULE) #undef ip6_sprintf #endif #endif - inet_ntoa_r(sin->sin_addr, buf), port); + inet_ntoa_r(sin->sin_addr, buf), port); + } svcerr_weakauth(rqst); svc_freereq(rqst); m_freem(nd.nd_mrep);