2 files changed, 6 insertions, 5 deletions

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index b441d82c338a..ba5d8f7cc5f2 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -700,7 +700,7 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size)
         int r;
         char *new_name = (char *) param + param->data_start;
 
-        if (new_name < (char *) (param + 1) ||
+        if (new_name < (char *) param->data ||
             invalid_str(new_name, (void *) param + param_size)) {
                 DMWARN("Invalid new logical volume name supplied.");
                 return -EINVAL;
@@ -726,7 +726,7 @@ static int dev_set_geometry(struct dm_ioctl *param, size_t param_size)
         if (!md)
                 return -ENXIO;
 
-        if (geostr < (char *) (param + 1) ||
+        if (geostr < (char *) param->data ||
             invalid_str(geostr, (void *) param + param_size)) {
                 DMWARN("Invalid geometry supplied.");
                 goto out;
@@ -1233,7 +1233,7 @@ static int target_message(struct dm_ioctl *param, size_t param_size)
         if (r)
                 goto out;
 
-        if (tmsg < (struct dm_target_msg *) (param + 1) ||
+        if (tmsg < (struct dm_target_msg *) param->data ||
             invalid_str(tmsg->message, (void *) param + param_size)) {
                 DMWARN("Invalid target message parameters.");
                 r = -EINVAL;
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index b93486107821..523281c5b7f5 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -131,6 +131,7 @@ struct dm_ioctl {
         char name[DM_NAME_LEN]; /* device name */
         char uuid[DM_UUID_LEN]; /* unique identifier for
                                  * the block device */
+        char data[7];           /* padding or data */
 };
 
 /*
@@ -285,9 +286,9 @@ typedef char ioctl_struct[308];
 #define DM_DEV_SET_GEOMETRY     _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 
 #define DM_VERSION_MAJOR        4
-#define DM_VERSION_MINOR        11
+#define DM_VERSION_MINOR        12
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2006-10-12)"
+#define DM_VERSION_EXTRA        "-ioctl (2007-10-02)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */