Skip to content

Commit

Permalink
NFSv4: Fix a bug in nfs4_validate_mount_data()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Oct 9, 2007
1 parent 91ea40b commit 20c71f5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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:
Expand Down

0 comments on commit 20c71f5

Please sign in to comment.