Date: Wed, 7 Mar 2012 03:11:28 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r232636 - projects/nfsv4.1-client/sys/fs/nfsclient Message-ID: <201203070311.q273BSsl072614@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Wed Mar 7 03:11:28 2012 New Revision: 232636 URL: http://svn.freebsd.org/changeset/base/232636 Log: Avoid a crash when NFSv4.1 callbacks with procedure numbers >= NFSV4OP_CBNOPS fail due to an error like NFSERR_NOTSUPP. Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c Wed Mar 7 01:31:29 2012 (r232635) +++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c Wed Mar 7 03:11:28 2012 (r232636) @@ -4399,7 +4399,10 @@ nfscl_errmap(struct nfsrv_descript *nd) if (nd->nd_repstat == NFSERR_MINORVERMISMATCH || nd->nd_repstat == NFSERR_OPILLEGAL) return (txdr_unsigned(nd->nd_repstat)); - errp = defaulterrp = nfscl_cberrmap[nd->nd_procnum]; + if (nd->nd_procnum < NFSV4OP_CBNOPS) + errp = defaulterrp = nfscl_cberrmap[nd->nd_procnum]; + else + return (txdr_unsigned(nd->nd_repstat)); while (*++errp) if (*errp == (short)nd->nd_repstat) return (txdr_unsigned(nd->nd_repstat));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203070311.q273BSsl072614>