diff options
| author | NeilBrown <neilb@suse.com> | 2017-01-04 08:54:43 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2017-01-04 10:07:33 -0500 |
| commit | 995806ff0c9f0e11fb9e536f0a17a5e11e9928cf (patch) | |
| tree | a5a2e6584d7f194ea6fcb9367345ba15c748a149 | |
| parent | 4459743e3daad32e2c2a753ec9982f35ef26a2a3 (diff) | |
| download | nfs-utils-995806ff0c9f0e11fb9e536f0a17a5e11e9928cf.tar.gz nfs-utils-995806ff0c9f0e11fb9e536f0a17a5e11e9928cf.tar.xz nfs-utils-995806ff0c9f0e11fb9e536f0a17a5e11e9928cf.zip | |
nfsd: Do not permit manipulation of NFSv4.0, e.g. "-N 4.0"
The code maps this into "-4.32", which the kernel rejects.
The kernel also rejects "-4.0" (when written to the 'versions' file).
So require the minor number to be at least NFS4_MINMINOR, which is '1'.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | utils/nfsd/nfsd.c | 4 | ||||
| -rw-r--r-- | utils/nfsd/nfsd.man | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c index eb346f6..20f4b79 100644 --- a/utils/nfsd/nfsd.c +++ b/utils/nfsd/nfsd.c @@ -179,7 +179,7 @@ main(int argc, char **argv) case 4: if (*p == '.') { int i = atoi(p+1); - if (i > NFS4_MAXMINOR) { + if (i < NFS4_MINMINOR || i > NFS4_MAXMINOR) { fprintf(stderr, "%s: unsupported minor version\n", optarg); exit(1); } @@ -201,7 +201,7 @@ main(int argc, char **argv) case 4: if (*p == '.') { int i = atoi(p+1); - if (i > NFS4_MAXMINOR) { + if (i < NFS4_MINMINOR || i > NFS4_MAXMINOR) { fprintf(stderr, "%s: unsupported minor version\n", optarg); exit(1); } diff --git a/utils/nfsd/nfsd.man b/utils/nfsd/nfsd.man index 8d198e2..8901fb6 100644 --- a/utils/nfsd/nfsd.man +++ b/utils/nfsd/nfsd.man @@ -57,7 +57,7 @@ This option can be used to request that .B rpc.nfsd does not offer certain versions of NFS. The current version of .B rpc.nfsd -can support NFS versions 2,3,4 and the newer version 4.1. +can support major NFS versions 2,3,4 and the minor versions 4.1 and 4.2. .TP .B \-s " or " \-\-syslog By default, @@ -82,7 +82,7 @@ This option can be used to request that .B rpc.nfsd offer certain versions of NFS. The current version of .B rpc.nfsd -can support NFS versions 2,3,4 and the newer version 4.1. +can support major NFS versions 2,3,4 and the minor versions 4.1 and 4.2. .TP .B \-L " or " \-\-lease-time seconds Set the lease-time used for NFSv4. This corresponds to how often |