iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dm ioctl: prepare for crypt key wiping

Browse Source 
Prepare code for implementing buffer wipe flag.
No functional change in this patch.

Signed-off-by: Milan Broz <mbroz@redhat.com>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Milan Broz 2011-03-24 13:54:28 +00:00 committed by Alasdair G Kergon
parent de8be5ac70
commit 6bb43b5d1f
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/md/dm-ioctl.c
View File

@ -1501,11 +1501,6 @@ static int check_version(unsigned int cmd, struct dm_ioctl __user *user)
return r; return r;
} }
static void free_params(struct dm_ioctl *param)
{
vfree(param);
}
static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl **param) static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl **param)
{ {
struct dm_ioctl tmp, *dmi; struct dm_ioctl tmp, *dmi;
@ -1520,13 +1515,15 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl **param)
if (!dmi) if (!dmi)
return -ENOMEM; return -ENOMEM;
if (copy_from_user(dmi, user, tmp.data_size)) { if (copy_from_user(dmi, user, tmp.data_size))
vfree(dmi); goto bad;
return -EFAULT;
}
*param = dmi; *param = dmi;
return 0; return 0;
bad:
vfree(dmi);
return -EFAULT;
} }
static int validate_params(uint cmd, struct dm_ioctl *param) static int validate_params(uint cmd, struct dm_ioctl *param)
@ -1564,7 +1561,7 @@ static int ctl_ioctl(uint command, struct dm_ioctl __user *user)
unsigned int cmd; unsigned int cmd;
struct dm_ioctl *uninitialized_var(param); struct dm_ioctl *uninitialized_var(param);
ioctl_fn fn = NULL; ioctl_fn fn = NULL;
size_t param_size; size_t input_param_size;
/* only root can play with this */ /* only root can play with this */
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
@ -1605,6 +1602,7 @@ static int ctl_ioctl(uint command, struct dm_ioctl __user *user)
* Copy the parameters into kernel space. * Copy the parameters into kernel space.
*/ */
r = copy_params(user, &param); r = copy_params(user, &param);
input_param_size = param->data_size;
current->flags &= ~PF_MEMALLOC; current->flags &= ~PF_MEMALLOC;
@ -1615,9 +1613,8 @@ static int ctl_ioctl(uint command, struct dm_ioctl __user *user)
if (r) if (r)
goto out; goto out;
param_size = param->data_size;
param->data_size = sizeof(*param); param->data_size = sizeof(*param);
r = fn(param, param_size); r = fn(param, input_param_size);
/* /*
* Copy the results back to userland. * Copy the results back to userland.
@ -1626,7 +1623,7 @@ static int ctl_ioctl(uint command, struct dm_ioctl __user *user)
r = -EFAULT; r = -EFAULT;
out: out:
free_params(param); vfree(param);
return r; return r;
} }