renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 09:43:59 +08:00
Code

NFS: dont allow minorversion= opt when vers != 4

Browse Source 
Don't allow invalid 'vers' and 'minorversion' combinations in mount options,
such as "vers=3,minorversion=1".

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Weston Andros Adamson 2012-02-01 14:06:41 -05:00 committed by Trond Myklebust
parent 2f09c24216
commit 571b755401
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfs/super.c
View File

@ -1531,6 +1531,9 @@ static int nfs_parse_mount_options(char *raw,
if (!sloppy && invalid_option) if (!sloppy && invalid_option)
return 0; return 0;
if (mnt->minorversion && mnt->version != 4)
goto out_minorversion_mismatch;
/* /*
* verify that any proto=/mountproto= options match the address * verify that any proto=/mountproto= options match the address
* familiies in the addr=/mountaddr= options. * familiies in the addr=/mountaddr= options.
@ -1564,6 +1567,10 @@ out_invalid_address:
out_invalid_value: out_invalid_value:
printk(KERN_INFO "NFS: bad mount option value specified: %s\n", p); printk(KERN_INFO "NFS: bad mount option value specified: %s\n", p);
return 0; return 0;
out_minorversion_mismatch:
printk(KERN_INFO "NFS: mount option vers=%u does not support "
"minorversion=%u\n", mnt->version, mnt->minorversion);
return 0;
out_nomem: out_nomem:
printk(KERN_INFO "NFS: not enough memory to parse option\n"); printk(KERN_INFO "NFS: not enough memory to parse option\n");
return 0; return 0;