diff --git a/[refs] b/[refs] index c9311fde41f5..af6df3b47537 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 764302ccb88dd0df062eccd507b6c6de24f1c560 +refs/heads/master: 2ecda72b49a0849ce41e7fa1fa974a245b9119f8 diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index 34b1ccf51adf..867f70504531 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -2321,6 +2321,12 @@ static int nfs4_validate_text_mount_data(void *options, nfs4_validate_mount_flags(args); + if (args->version != 4) { + dfprintk(MOUNT, + "NFS4: Illegal mount version\n"); + return -EINVAL; + } + if (args->auth_flavor_len > 1) { dfprintk(MOUNT, "NFS4: Too many RPC auth flavours specified\n");