From nobody Sat Nov 27 00:00:02 2021 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 D8F3718B8D9E; Sat, 27 Nov 2021 00:00:02 +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 4J1BZB4Dm8z3qsN; Sat, 27 Nov 2021 00:00:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 71D3B1210E; Sat, 27 Nov 2021 00:00:02 +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 1AR002Pr066855; Sat, 27 Nov 2021 00:00:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AR0024X066852; Sat, 27 Nov 2021 00:00:02 GMT (envelope-from git) Date: Sat, 27 Nov 2021 00:00:02 GMT Message-Id: <202111270000.1AR0024X066852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 5b430a132330 - main - nfsd: Sanity check the len argument for ListXattr 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b430a132330bd4a4ea37780807947f3800d009e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637971202; 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=cLFaU3UG9KXih0+RNcJ7R5sL1XZ3UY/5PCcBa0UeFtM=; b=WKOF9OMj12bq3FvvK/dAd0dIlnylYQNGsw9897IiRFK7BwyGOAPHiNYP1C+BkbA/PdbaVj xPaPA3JZngZMzkx+mFKCL90nlHpaTtf/aWA7lREk1CRrOMN6vLIQ94oMP2slwVevP+SPJA 0FSIL5+zQLBpGY/0NfR+gCe0+khJbCM/7gX6llih0L3wi+oLvh9et50xYnxGLcSnGXpTy6 +GZna6+Xz7xoN2f9pkMcmDoa69+7W6TKoLOhq6xmdNEiKLYa+25ag1kxWRIhig7jSWcJzt h6rgFXfJwRaqq4ZzUmW8Mo5LRosbeHniBmVDyscD/a+N9Rg8a69KXJc3UVPs/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637971202; a=rsa-sha256; cv=none; b=RfItwkU3fh+AnrIOrjDMCDEVFNw/T7uokzUtk4pwFmW9Af18+0ZCN0jcqo+iJIaL7NA2qX rvPo2gQ72FSw1R5hj4K1prgFxgK0Ssr3xBuzWxx+BfF1DMhjzB848nnFt09Kh1imPg65sM wugu+v8s2MfaNr3ygVn2Lsj0n+iYxbYouZzkgjPEQkNyCdhh/vSUOoykCvdl9DM56BQzJx VVBLYb3Cu/ZWzdjItzEzLGq9fYjfuxYSyqYz7xrnXUq4LI+Oysndqd/blZC2Q9sCrWpSjy e3EA89zZkrKBK6uIp4tdiEpvl7r0Mq3jLVg1CgUci92J1JGUCaMPNGm458SqZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=5b430a132330bd4a4ea37780807947f3800d009e commit 5b430a132330bd4a4ea37780807947f3800d009e Author: Rick Macklem AuthorDate: 2021-11-26 23:56:29 +0000 Commit: Rick Macklem CommitDate: 2021-11-26 23:56:29 +0000 nfsd: Sanity check the len argument for ListXattr The check for the original len being >= retlen needs to be done before the "if (nd->nd_repstat == 0)" code, so that it can be reported as too small. Reported by: rtm@lcs.mit.edu Tested by: rtm@lcs.mit.edu PR: 260046 MFC after: 2 weeks --- sys/fs/nfsserver/nfs_nfsdserv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 80c492251ce8..4c5dade2c278 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -6095,10 +6095,12 @@ nfsrvd_listxattr(struct nfsrv_descript *nd, __unused int isdgram, if (cookie2 < cookie) nd->nd_repstat = NFSERR_BADXDR; } + retlen = NFSX_HYPER + 2 * NFSX_UNSIGNED; + if (nd->nd_repstat == 0 && len2 < retlen) + nd->nd_repstat = NFSERR_TOOSMALL; if (nd->nd_repstat == 0) { /* Now copy the entries out. */ - retlen = NFSX_HYPER + 2 * NFSX_UNSIGNED; - if (len == 0 && retlen <= len2) { + if (len == 0) { /* The cookie was at eof. */ NFSM_BUILD(tl, uint32_t *, NFSX_HYPER + 2 * NFSX_UNSIGNED);