summaryrefslogtreecommitdiff
path: root/drivers/md/dm-ioctl.c
diff options
context:
space:
mode:
authorMilan Broz <mbroz@redhat.com>2009-03-16 16:56:01 +0000
committerAlasdair G Kergon <agk@redhat.com>2009-03-16 16:56:01 +0000
commitbc0fd67feba2e0770aad85393500ba77c6489f1c (patch)
tree898f91bc16492588dc74f191979dcca5462cdc36 /drivers/md/dm-ioctl.c
parent5bee17f18b595937e6beafeee5197868a3f74a06 (diff)
downloadlinux-3.10-bc0fd67feba2e0770aad85393500ba77c6489f1c.tar.gz
linux-3.10-bc0fd67feba2e0770aad85393500ba77c6489f1c.tar.bz2
linux-3.10-bc0fd67feba2e0770aad85393500ba77c6489f1c.zip
dm ioctl: validate name length when renaming
When renaming a mapped device validate the length of the new name. The rename ioctl accepted any correctly-terminated string enclosed within the data passed from userspace. The other ioctls enforce a size limit of DM_NAME_LEN. If the name is changed and becomes longer than that, the device can no longer be addressed by name. Fix it by properly checking for device name length (including terminating zero). Cc: stable@kernel.org Signed-off-by: Milan Broz <mbroz@redhat.com> Reviewed-by: Jonathan Brassow <jbrassow@redhat.com> Reviewed-by: Alasdair G Kergon <agk@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md/dm-ioctl.c')
-rw-r--r--drivers/md/dm-ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 54d0588fc1f..977f36612e8 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -704,7 +704,8 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size)
char *new_name = (char *) param + param->data_start;
if (new_name < param->data ||
- invalid_str(new_name, (void *) param + param_size)) {
+ invalid_str(new_name, (void *) param + param_size) ||
+ strlen(new_name) > DM_NAME_LEN - 1) {
DMWARN("Invalid new logical volume name supplied.");
return -EINVAL;
}