From nobody Sat Dec 04 22:25:22 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 AAA19189FA0B; Sat, 4 Dec 2021 22:25:22 +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 4J645G3GHrz4RHp; Sat, 4 Dec 2021 22:25:22 +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 4BFBE4943; Sat, 4 Dec 2021 22:25:22 +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 1B4MPMRr006845; Sat, 4 Dec 2021 22:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B4MPMSE006843; Sat, 4 Dec 2021 22:25:22 GMT (envelope-from git) Date: Sat, 4 Dec 2021 22:25:22 GMT Message-Id: <202112042225.1B4MPMSE006843@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: 480be96e1e24 - main - nfsd: Sanity check the Layouttype count 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: 480be96e1e24617f0f152256d7453f60774fd1f3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638656722; 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=gW/amRnZ3Frg/pKlY8bQ2Y8Vpwpc2mKoGoslqlCWVSk=; b=WXhtBYZ3sBXJUhukgCxhvZIs7ZYlxZH7UqOqEXXY0w2QokGqaKBmcvOM1GL88O/l4hSm0S ZLitOgJ3xwPKOSRKvwYWUwxU1OhE7Z8PtqO8DrT/JSI6DhBrz9cUP7ImG/+uRjGFQoanz7 PntPpeDtiDHbc5SSoTZHIMjFBBrm3+eoqKRLTBAeg+IeXEcswUxZUmE1M8hFZfdR2NXxSI p3Ggtm0srOqvL/np5d/TBOCxejqIFdzIGkyoLosHFZD2MnXsSm5OIvjxiEbskxoyfdJ62d pgzI7viudyN4UJvYdA8N0DyCc0OttNHRkDJL7jVVuVvxCzs5tXDttmRUWofIUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638656722; a=rsa-sha256; cv=none; b=oSyjAWzkeaDsE/EJ1cg8MmsEkADSF6aa3wphX5cP0vaP8xENZVy5iKUK5p6k2DkQIwrA43 YRYsbar95bFbtcgT4on4e4XLCVjrCtwhmFF8/pc+FE8jwYV76JhRpS7grLDU+p5JmSuauk Gtsf5pdKJ643oWUvCd6ReC/gW1KOamC182sUhvErIGl+SEN3Vm9teNncQd1E9i+2teK0Mu 9cw6gX2caVxTWfyo/XDg8EHSGs2YDYQTyDbw5cc3OHsMEI0yB+brIA3/5Ufvv6kWKE67Zv zv58rfTP7pqCp5kih2gd+ufA/3amwSNYBW+mucOYgs7A+n6sZhionaGbl9ms0g== 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=480be96e1e24617f0f152256d7453f60774fd1f3 commit 480be96e1e24617f0f152256d7453f60774fd1f3 Author: Rick Macklem AuthorDate: 2021-12-04 22:18:48 +0000 Commit: Rick Macklem CommitDate: 2021-12-04 22:22:19 +0000 nfsd: Sanity check the Layouttype count Reported by: rtm@lcs.mit.edu Tested by: rtm@lcs.mit.edu PR: 260155 MFC after: 2 weeks --- sys/fs/nfs/nfs_commonsubs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index d882d248ef7f..550dda43afa6 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -2186,6 +2186,15 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); attrsum += NFSX_UNSIGNED; i = fxdr_unsigned(int, *tl); + /* + * The RFCs do not define an upper limit for the + * number of layout types, but 32 should be more + * than enough. + */ + if (i < 0 || i > 32) { + error = NFSERR_BADXDR; + goto nfsmout; + } if (i > 0) { NFSM_DISSECT(tl, u_int32_t *, i * NFSX_UNSIGNED);