From nobody Fri May 20 00:36:49 2022 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 9349C1B459EA; Fri, 20 May 2022 00:36:50 +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 4L478L0vkhz3rQX; Fri, 20 May 2022 00:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653007010; 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=FmHJRIYm4qi3dmj8SMbXwS3wr2Vb9K1M8v/p8Gt3RTE=; b=wuZ0UNj3swDeh802Xy/gEOQyv9+M+SWXfCNZoHYoEhpZWdMq8GZa4knIm6O896vBGQLcaD ie0u2Pqy6OfuPm4qOyScfxRzW+CT80lKSxTlaqUuOyPtaOgeq59q4j3zTxrLrt3tHFiJyI E6dcX9G4KJsrX8Prre3Yyc/NJTACAi36irjMu3588PNaNinp4drJ1TxDfs6OTV6md8OMtW wVrT36i2SM6MhnvPD0SkUViWwrs9y2n81Pp6yp4KarszOEkE2HlAQqVd93cPGLIflfJ0gO KK6p+kI4dg0EYpFl7Zu52NOCu/sDPcIzEIb5RUkf4vY8jktVdZvdsj9vNyFkDw== 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 F40C112D; Fri, 20 May 2022 00:36:49 +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 24K0answ091015; Fri, 20 May 2022 00:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24K0anYP091014; Fri, 20 May 2022 00:36:49 GMT (envelope-from git) Date: Fri, 20 May 2022 00:36:49 GMT Message-Id: <202205200036.24K0anYP091014@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: f01978f464ce - stable/13 - nfsd: Add a sanity check for Owner/OwnerGroup string length 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f01978f464cea1cffeb1a66a18f92d98380dd7f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653007010; 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=FmHJRIYm4qi3dmj8SMbXwS3wr2Vb9K1M8v/p8Gt3RTE=; b=VN9c3i8si9D8GmENJPIe1GO3KpEn9kXO8LWD6R+U1u6a8qGB4jjz+zhXQO+4of1wL1NCjn DVoPwyR5ekJtUGR8/F4jf9qU0ZbgY85BFI7FqXK3NSDJ/W8ru+/g2ItLkC3YCckiOUoFLX +0Z7R0OGCp/bqiqIV6IeIjCm5JjCdSrbdtTAoDqz4jRD0sZXs/5rKaFdhuwS1Ta2W+4Uxj ayShG4n6OFBczlg3y3Ze9IyLHMKIT9kM0JdGT7qixltWSOkYAp9vA89dpFxkgWtdsFKoVV bI5KQn6WSdWe3xDIIw2B7pHkY2ZBNGSWaLOFjuuXI6NIMFDxc7LRS/66DmSIhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653007010; a=rsa-sha256; cv=none; b=C1zF5rnHCs70+NN5gmHsDnQPZLFWxEwOUocVlExMTrPB5FQt5CsrW2ID52evWZUY6WumEk KZ9xTuyp13bsV+hC3If5lskXUOOa159g9FsTCN14hsac1xege4pNdWSE+qjuapW66KQKgn XglDcFuRn6mupt9UZetULyx9H1iZueda6WNNuiK/ynzSk2nxVtBu7OL04zQzVXNUD7PoTQ 3ueQM0Q6KqilpY992nqxNX239wWX8fzjp9PtZk9VhPBtU2EeLPcIB5OFHSwtmO4PRp9L0S EJXEC7Kla1Zha+rYw9ENQk12A5nA3HjpLE0C/1ZTF138whPRgIfLsupccJAd6g== 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=f01978f464cea1cffeb1a66a18f92d98380dd7f2 commit f01978f464cea1cffeb1a66a18f92d98380dd7f2 Author: Rick Macklem AuthorDate: 2022-05-04 20:58:22 +0000 Commit: Rick Macklem CommitDate: 2022-05-20 00:36:22 +0000 nfsd: Add a sanity check for Owner/OwnerGroup string length Robert Morris reported that, if a client sends an absurdly large Owner/OwnerGroup string, the kernel malloc() for the large size string can block forever. This patch adds a sanity limit for Owner/OwnerGroup string length. Since the RFCs do not specify any limit and FreeBSD can handle a group name greater than 1Kbyte, the limit is set at a generous 10Kbytes. PR: 260546 (cherry picked from commit ef4edb70c909fc2b1de867601c2230597d07daa0) --- sys/fs/nfs/nfs.h | 7 +++++++ sys/fs/nfs/nfs_commonsubs.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs.h b/sys/fs/nfs/nfs.h index 1a29a7e1d6ec..ffd612331c1f 100644 --- a/sys/fs/nfs/nfs.h +++ b/sys/fs/nfs/nfs.h @@ -143,6 +143,13 @@ #define NFS_READDIRBLKSIZ DIRBLKSIZ /* Minimal nm_readdirsize */ +/* + * The NFSv4 RFCs do not define an upper limit on the length of Owner and + * OwnerGroup strings. Since FreeBSD handles a group name > 1024bytes in + * length, set a generous sanity limit of 10Kbytes. + */ +#define NFSV4_MAXOWNERGROUPLEN (10 * 1024) + /* * Oddballs */ diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 51071a6f03ca..eb6746ec3041 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -1838,7 +1838,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, case NFSATTRBIT_OWNER: NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); j = fxdr_unsigned(int, *tl); - if (j < 0) { + if (j < 0 || j > NFSV4_MAXOWNERGROUPLEN) { error = NFSERR_BADXDR; goto nfsmout; } @@ -1871,7 +1871,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, case NFSATTRBIT_OWNERGROUP: NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); j = fxdr_unsigned(int, *tl); - if (j < 0) { + if (j < 0 || j > NFSV4_MAXOWNERGROUPLEN) { error = NFSERR_BADXDR; goto nfsmout; }