From nobody Sat Dec 11 02:29:51 2021 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 02D9218E3CA8; Sat, 11 Dec 2021 02: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 4J9sDb58ZNz4VJs; Sat, 11 Dec 2021 02:29:51 +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 913C725A4B; Sat, 11 Dec 2021 02:29:51 +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 1BB2Tppg078798; Sat, 11 Dec 2021 02:29:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BB2TprB078797; Sat, 11 Dec 2021 02:29:51 GMT (envelope-from git) Date: Sat, 11 Dec 2021 02:29:51 GMT Message-Id: <202112110229.1BB2TprB078797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 5b76a6b862ad - stable/13 - nfsd: Sanity check the len argument for ListXattr 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b76a6b862ad5ea35c3f9a4572b6388acdfd3de7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639189791; 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=DeoO1xSeV6QiAgLTpGz0J2JGp77wAetSnXkUiwsl7rc=; b=SwX7xiwOzbRB4BKzpI6vipkPmGCxr+aIrTaiaMJ5UjztNHNLeKRR2tg92wEzDBblP2gZdn /TWaYf9Y4eJXZ0fTP3Q8pdf1i5h5dY2t1AkJVzd723Fysh5VPn+bN9wdyIm2G2WJ4ZuXpt a8IQKHCCvDiJ+YqbVVWJjc1BrOU8YeEPkqL3CKT83pvu0KMfG9qxeRcX9qjX+KB+QKifmT wKp7oec6yrCqENCX8jU4T1pBXYoblMzEFn2olFlFOXE5zojpvAXV3RynFIqip3SxU3s1cG RFI5CXjsuM8EJhu/X0pN0FBTU8A97YxTXaXlWX1s/5lPj3uCU4WwjU/Nv8ltvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639189791; a=rsa-sha256; cv=none; b=S5TRs5Q8ry6OmqqLcccGUIiy2nVq0uCHpML9sNjy+rq5aaWGVVMQ/0A2NNBwlpJPBeP4zl oHls498gIjjgdA25BzoMvmAXxfB/qbvO7IuotScYXj5CJmUnLWveLZslo2Y+Rg89Q3ItLu n0mJMaEaXAJAF6U5dU1h/9aSmaQpsO5H6j9z7Ds+DocQb/zK0aRjb6VqvUvPG5w3z1w8eq jbDTH4ktT5z2ZohUk9xDIkqIh4eaAWHy9Lo7WX/498ezqf9k8wA0ig9HyJxea71DlvhgBq o34xAc4w5Jvkv+ouTTgpX2QPqUMHBkwK1tPOQMl5twMqd0isKN8POj3LPuhDVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=5b76a6b862ad5ea35c3f9a4572b6388acdfd3de7 commit 5b76a6b862ad5ea35c3f9a4572b6388acdfd3de7 Author: Rick Macklem AuthorDate: 2021-11-26 23:56:29 +0000 Commit: Rick Macklem CommitDate: 2021-12-11 02:26:22 +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. PR: 260046 (cherry picked from commit 5b430a132330bd4a4ea37780807947f3800d009e) --- 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 4ca49f75fc2c..517741a45288 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -5990,10 +5990,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);