NFSv4: Fix a bug in nfs4_validate_mount_data()

The previous patch introduced a bug when copying the server address.

Also clarify a copy into the auth_flavours array: currently the two
size calculations are equivalent, but we may decide to change the size
of auth_flavors[] at some point.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 63742bbcb1ce81071c412e2b652809ed95f86015..3804aadc18c409e165a836d0562c8adfdd2480c8 100644 (file)
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1541,7 +1541,7 @@ static int nfs4_validate_mount_data(void *options,
                        goto out_no_address;
                if (copy_from_user(&args->nfs_server.address,
                                   data->host_addr,
-                                  sizeof(&args->nfs_server.address)))
+                                  sizeof(args->nfs_server.address)))
                        return -EFAULT;
                if (args->nfs_server.address.sin_port == 0)
                        args->nfs_server.address.sin_port = htons(NFS_PORT);
@@ -1554,9 +1554,9 @@ static int nfs4_validate_mount_data(void *options,
                        args->auth_flavors[0] = RPC_AUTH_UNIX;
                        break;
                case 1:
-                       if (copy_from_user(args->auth_flavors,
+                       if (copy_from_user(&args->auth_flavors[0],
                                           data->auth_flavours,
-                                          sizeof(args->auth_flavors)))
+                                          sizeof(args->auth_flavors[0])))
                                return -EFAULT;
                        break;
                default: