[src/netbsd-10]: src/sys/nfs Pull up following revision(s) (requested by rias...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1134b5ea6f77
branches:  netbsd-10
changeset: 374073:1134b5ea6f77
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Mar 30 11:57:26 2023 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #134):

        sys/nfs/nfs_serv.c: revision 1.184
        sys/nfs/nfs_srvsubs.c: revision 1.17
        sys/nfs/nfsm_subs.h: revision 1.56
        sys/nfs/nfsm_subs.h: revision 1.57

nfs: Use unsigned fhlen so we don't trip over negative values.

nfs: Avoid integer overflow in nfs_namei bounds check.

nfs: Use unsigned name lengths so we don't trip over negative ones.
- nfsm_strsiz is only used with uint32_t in callers, but let's not
  leave it as a rake to step on.
- nfsm_srvnamesiz is abused with signed s.  The internal conversion
  to unsigned serves to reject both negative and too-large values in
  such callers.
  XXX Should make all callers use unsigned, rather than flipping back
  and forth between signed and unsigned for name lengths.

nfs: Avoid free of uninitialized on bad name size in create, mknod.
XXX These error branches are a nightmare and need to be more
systematically cleaned up.  Even if they are correct now, they are
impossible to audit and extremely fragile in case anyone ever needs
to make other changes to them.

diffstat:

 sys/nfs/nfs_serv.c    |  20 ++++++++++----------
 sys/nfs/nfs_srvsubs.c |   6 +++---
 sys/nfs/nfsm_subs.h   |  17 +++++++++++------
 3 files changed, 24 insertions(+), 19 deletions(-)

diffs (131 lines):

diff -r f4e382da2348 -r 1134b5ea6f77 sys/nfs/nfs_serv.c
--- a/sys/nfs/nfs_serv.c        Thu Mar 30 11:54:33 2023 +0000
+++ b/sys/nfs/nfs_serv.c        Thu Mar 30 11:57:26 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_serv.c,v 1.183 2022/04/27 17:38:52 hannken Exp $   */
+/*     $NetBSD: nfs_serv.c,v 1.183.4.1 2023/03/30 11:57:26 martin Exp $        */
 
 /*
  * Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.183 2022/04/27 17:38:52 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.183.4.1 2023/03/30 11:57:26 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1648,10 +1648,10 @@ nfsmout:
                        vput(nd.ni_dvp);
                if (nd.ni_vp)
                        vput(nd.ni_vp);
-       }
-       if (nd.ni_pathbuf != NULL) {
-               pathbuf_destroy(nd.ni_pathbuf);
-               nd.ni_pathbuf = NULL;
+               if (nd.ni_pathbuf != NULL) {
+                       pathbuf_destroy(nd.ni_pathbuf);
+                       nd.ni_pathbuf = NULL;
+               }
        }
        return (error);
 }
@@ -1801,10 +1801,10 @@ nfsmout:
                        vput(nd.ni_dvp);
                if (nd.ni_vp)
                        vput(nd.ni_vp);
-       }
-       if (nd.ni_pathbuf != NULL) {
-               pathbuf_destroy(nd.ni_pathbuf);
-               nd.ni_pathbuf = NULL;
+               if (nd.ni_pathbuf != NULL) {
+                       pathbuf_destroy(nd.ni_pathbuf);
+                       nd.ni_pathbuf = NULL;
+               }
        }
        if (dirp)
                vrele(dirp);
diff -r f4e382da2348 -r 1134b5ea6f77 sys/nfs/nfs_srvsubs.c
--- a/sys/nfs/nfs_srvsubs.c     Thu Mar 30 11:54:33 2023 +0000
+++ b/sys/nfs/nfs_srvsubs.c     Thu Mar 30 11:57:26 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_srvsubs.c,v 1.16 2022/04/27 17:38:52 hannken Exp $ */
+/*     $NetBSD: nfs_srvsubs.c,v 1.16.4.1 2023/03/30 11:57:26 martin Exp $      */
 
 /*
  * Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_srvsubs.c,v 1.16 2022/04/27 17:38:52 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_srvsubs.c,v 1.16.4.1 2023/03/30 11:57:26 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -129,7 +129,7 @@ nfs_namei(struct nameidata *ndp, nfsrvfh
        *retdirp = NULL;
        ndp->ni_pathbuf = NULL;
 
-       if ((len + 1) > NFS_MAXPATHLEN)
+       if (len > NFS_MAXPATHLEN - 1)
                return (ENAMETOOLONG);
        if (len == 0)
                return (EACCES);
diff -r f4e382da2348 -r 1134b5ea6f77 sys/nfs/nfsm_subs.h
--- a/sys/nfs/nfsm_subs.h       Thu Mar 30 11:54:33 2023 +0000
+++ b/sys/nfs/nfsm_subs.h       Thu Mar 30 11:57:26 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfsm_subs.h,v 1.55 2021/08/12 20:25:27 andvar Exp $    */
+/*     $NetBSD: nfsm_subs.h,v 1.55.4.1 2023/03/30 11:57:26 martin Exp $        */
 
 /*
  * Copyright (c) 1989, 1993
@@ -366,7 +366,7 @@
 
 #define        nfsm_strsiz(s,m) \
                { nfsm_dissect(tl,uint32_t *,NFSX_UNSIGNED); \
-               if (((s) = fxdr_unsigned(uint32_t,*tl)) > (m)) { \
+               if ((uint32_t)((s) = fxdr_unsigned(uint32_t,*tl)) > (m)) { \
                        m_freem(mrep); \
                        error = EBADRPC; \
                        goto nfsmout; \
@@ -374,7 +374,8 @@
 
 #define        nfsm_srvnamesiz(s) \
                { nfsm_dissect(tl,uint32_t *,NFSX_UNSIGNED); \
-               if (((s) = fxdr_unsigned(uint32_t,*tl)) > NFS_MAXNAMLEN) \
+               if ((uint32_t)((s) = fxdr_unsigned(uint32_t,*tl)) > \
+                   NFS_MAXNAMLEN) \
                        error = NFSERR_NAMETOL; \
                if (error) \
                        nfsm_reply(0); \
@@ -480,20 +481,24 @@
                } }
 
 #define nfsm_srvmtofh(nsfh) \
-       { int fhlen = NFSX_V3FH; \
+       { uint32_t fhlen = NFSX_V3FH; \
                if (nfsd->nd_flag & ND_NFSV3) { \
-                       nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
-                       fhlen = fxdr_unsigned(int, *tl); \
+                       nfsm_dissect(tl, uint32_t *, NFSX_UNSIGNED); \
+                       fhlen = fxdr_unsigned(uint32_t, *tl); \
+                       CTASSERT(NFSX_V3FHMAX <= FHANDLE_SIZE_MAX); \
                        if (fhlen > NFSX_V3FHMAX || \
                            (fhlen < FHANDLE_SIZE_MIN && fhlen > 0)) { \
                                error = EBADRPC; \
                                nfsm_reply(0); \
                        } \
                } else { \
+                       CTASSERT(NFSX_V2FH >= FHANDLE_SIZE_MIN); \
                        fhlen = NFSX_V2FH; \
                } \
                (nsfh)->nsfh_size = fhlen; \
                if (fhlen != 0) { \
+                       KASSERT(fhlen >= FHANDLE_SIZE_MIN); \
+                       KASSERT(fhlen <= FHANDLE_SIZE_MAX); \
                        nfsm_dissect(tl, u_int32_t *, fhlen); \
                        memcpy(NFSRVFH_DATA(nsfh), tl, fhlen); \
                } \