From nobody Sun May 15 19:18:12 2022 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 877F81AD7408; Sun, 15 May 2022 19:18:12 +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 4L1XGX3PPpz4bgG; Sun, 15 May 2022 19:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652642292; 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=ckOWnICLQrVX3BvGSUSdMduNNDUp71ZAtSwAaAYp9q4=; b=iHsDJMjTMawz8mJWYRaulnYDc61OnK923kvpImgAjxwh2mSUw1W4oKHAsLryyZO4ThPbVd r/lOf1djk82mR7DofVQqbqYOFzPP6w5mmOkQ7pIbtnad0thjKnhJfDxgvOWvneZPDEChDr cMPQZp/IQOHIThSemCq6c4OnG5fRIb9kwDyPoZ4VstKJoIiv+EQXv1lQ4yQrImFoE5Oc7p I7yutdlgLCmMdhJoia+LwZkWlqaNNxS7LrVyf+pMlhneKukJjzYQUyQr2IGYPY7sG8IFaH IeTg581/83y6QKC2sWDknoj30k/HmsDT5on/uDjFLIajScX7rr9BEc/8n1kBAQ== 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 54A09115DA; Sun, 15 May 2022 19:18:12 +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 24FJIC2M063547; Sun, 15 May 2022 19:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24FJICX3063546; Sun, 15 May 2022 19:18:12 GMT (envelope-from git) Date: Sun, 15 May 2022 19:18:12 GMT Message-Id: <202205151918.24FJICX3063546@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: a1735a7698a6 - stable/13 - nfsd: Add a sanity check to SecinfoNoname for file type 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: a1735a7698a60eff1e0682261033e37fc530f85d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652642292; 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=ckOWnICLQrVX3BvGSUSdMduNNDUp71ZAtSwAaAYp9q4=; b=ac37Xfxr0uLMF5Vlmt5ESHz6EABrQPEtTaOyvObiXKsgFjI7Z8Q8PTMXFycoI3H3+/959j 69bQyEffkvX2FJo75iE/coT7GFpEw154QieKN1gZvDvxkq7hXNmUyRW/l5WNybsagqH5gt BQe9+OQxi1lHKlQrrHKP2sj4+7kdVXeSRO2R6VxxggLVGysdzZzKvhmcyBowxyVTmXkb+n 7wlO2I0sn0hRQY1FgJSoapCgSJ3z9OLE2H7ZJSv/BaSbBVAxvCNiguK7Fkxvo1D1SkUGyU Wfdm6tapWcno/qaAdZaO1lFdg6p85KFiZlTUxbO4HW3CjdBOXdAvtOom2irRTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652642292; a=rsa-sha256; cv=none; b=XypfNaWOFOT1xeFz3mFi/WJktNCF05viilYEHL8wAhEKpS2GPFbkh+tuUjyUbzwKaSQvbm 1l1K+vKTTnUMK8VMRIKFZ+skDhYeGMEAPa8WhZ6W/vpegJjEClQWxFJpiBun2vCfNnYb88 MGqzgLS5uzMKgLDoYMDyUYFzClXUwhJ6inO1iqwfS/oEx9VBem08SoabBNjSw37PunHnhk PaD/yVWe9Ju7jUIglS0x1JbWX8jKrAcB79X4I0h9wo0CIzCDhE3a4W0U3Bvvd7qfTXJqaq Mdam4vG36CGgdvOtdAOWo6E1iPxPHjCEADxNIw2AV8y6AAs6GxAmxDaGpTZVPQ== 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=a1735a7698a60eff1e0682261033e37fc530f85d commit a1735a7698a60eff1e0682261033e37fc530f85d Author: Rick Macklem AuthorDate: 2022-05-01 20:41:31 +0000 Commit: Rick Macklem CommitDate: 2022-05-15 19:17:11 +0000 nfsd: Add a sanity check to SecinfoNoname for file type Robert Morris reported that, for the case of SecinfoNoname with the Parent option, providing a non-directory could cause a crash. This patch adds a sanity check for v_type == VDIR for this case, to avoid the crash. PR: 260300 (cherry picked from commit 47d75c29f5510ad844f0bc7fbc07d481ebb7fd9e) --- sys/fs/nfsserver/nfs_nfsdserv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index d72716ce7fd8..2bb113b6441d 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3822,6 +3822,11 @@ nfsrvd_secinfononame(struct nfsrv_descript *nd, int isdgram, fhstyle = fxdr_unsigned(int, *tl); switch (fhstyle) { case NFSSECINFONONAME_PARENT: + if (dp->v_type != VDIR) { + vput(dp); + nd->nd_repstat = NFSERR_NOTDIR; + goto nfsmout; + } NFSNAMEICNDSET(&named.ni_cnd, nd->nd_cred, LOOKUP, LOCKLEAF | SAVESTART); nfsvno_setpathbuf(&named, &bufp, &hashp);