Date: Thu, 23 Dec 2021 01:38:15 GMT From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: c4ad95fb8e42 - stable/13 - nfscl: Check for an error return from nfsrv_getattrbits() Message-ID: <202112230138.1BN1cF1U037165@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=c4ad95fb8e4221ffcf435c4714923db7d791737b commit c4ad95fb8e4221ffcf435c4714923db7d791737b Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2021-12-09 22:32:22 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2021-12-23 01:34:53 +0000 nfscl: Check for an error return from nfsrv_getattrbits() There were two places where the client code did not check for a parse error return from nfsrv_getattrbits(). This patch fixes both of these cases. PR: 260272 (cherry picked from commit ab639f2398bf7efd4dfd38cd6527e22f6e781ae9) --- sys/fs/nfsclient/nfs_clrpcops.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index a87495da8568..bd2e1f24eef2 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2267,7 +2267,9 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, stateid.other[1] = *tl++; stateid.other[2] = *tl; rflags = fxdr_unsigned(u_int32_t, *(tl + 6)); - (void) nfsrv_getattrbits(nd, &attrbits, NULL, NULL); + error = nfsrv_getattrbits(nd, &attrbits, NULL, NULL); + if (error) + goto nfsmout; NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); deleg = fxdr_unsigned(int, *tl); if (deleg == NFSV4OPEN_DELEGATEREAD || @@ -7908,7 +7910,9 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namelen, struct vattr *vap, stateid.other[0] = *tl++; stateid.other[1] = *tl++; stateid.other[2] = *tl; - nfsrv_getattrbits(nd, &attrbits, NULL, NULL); + error = nfsrv_getattrbits(nd, &attrbits, NULL, NULL); + if (error != 0) + goto nfsmout; NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); deleg = fxdr_unsigned(int, *tl); if (deleg == NFSV4OPEN_DELEGATEREAD ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112230138.1BN1cF1U037165>