Require that the minorversion field in COMPOUND4args is set properly

If clients want to do automatic detection of the version of NFSv4 that is supported by the server, this check must be in place.
buildbarn · Jul 10, 2024 · d8809a2 · d8809a2
1 parent 6350e7a
commit d8809a2
Show file tree

Hide file tree

Showing 3 changed files with 136 additions and 61 deletions.
diff --git a/pkg/filesystem/virtual/nfsv4/nfs40_program.go b/pkg/filesystem/virtual/nfsv4/nfs40_program.go
@@ -127,6 +127,13 @@ func (*nfs40Program) NfsV4Nfsproc4Null(ctx context.Context) error {
 }
 
 func (p *nfs40Program) NfsV4Nfsproc4Compound(ctx context.Context, arguments *nfsv4.Compound4args) (*nfsv4.Compound4res, error) {
+	if arguments.Minorversion != 0 {
+		return &nfsv4.Compound4res{
+			Status:   nfsv4.NFS4ERR_MINOR_VERS_MISMATCH,
+			Tag:      arguments.Tag,
+		}, nil
+	}
+
 	// Create compound state and process all operations sequentially
 	// against it.
 	state := compoundState{program: p}

diff --git a/pkg/filesystem/virtual/nfsv4/nfs41_program.go b/pkg/filesystem/virtual/nfsv4/nfs41_program.go
@@ -128,6 +128,13 @@ func (*nfs41Program) NfsV4Nfsproc4Null(ctx context.Context) error {
 }
 
 func (p *nfs41Program) NfsV4Nfsproc4Compound(ctx context.Context, arguments *nfsv4.Compound4args) (*nfsv4.Compound4res, error) {
+	if arguments.Minorversion != 1 {
+		return &nfsv4.Compound4res{
+			Status: nfsv4.NFS4ERR_MINOR_VERS_MISMATCH,
+			Tag:    arguments.Tag,
+		}, nil
+	}
+
 	var resArray []nfsv4.NfsResop4
 	status := nfsv4.NFS4_OK
 	if len(arguments.Argarray) >= 1 {