Fix status overflow check in kernel patches.

diff --git a/VERSION b/VERSION
index 239d160af532056579ec05305fcd3b1cd1e3aade..2c12017927e8f549aaefd0eb77beb4f2bf83ac3a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.14-cvs (2004-04-06)
+1.00.15-cvs (2004-04-07)

diff --git a/WHATS_NEW b/WHATS_NEW
index 442702d61b3eeeab7cbcafad6b6314acf0b872ae..f1885a67583e93124b5b51aca934ef8a6c6d366c 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,3 +1,7 @@
+Version 1.00.15 - 7 Apr 2004
+============================
+  Fix status overflow check in kernel patches.
+
 Version 1.00.14 - 6 Apr 2004
 ============================
   Fix static selinux build.

diff --git a/kernel/ioctl/dm-ioctl.c b/kernel/ioctl/dm-ioctl.c
index de2ff8f3a0fa16b7c18b6aeff8fafbe36c869133..df6c07df2174f9c5378ea29456f8c48abf740a16 100644 (file)
--- a/kernel/ioctl/dm-ioctl.c
+++ b/kernel/ioctl/dm-ioctl.c
@@ -802,7 +802,7 @@ static void retrieve_status(struct dm_table *table, struct dm_ioctl *param,
                struct dm_target *ti = dm_table_get_target(table, i);
 
                remaining = len - (outptr - outbuf);
-               if (remaining < sizeof(struct dm_target_spec)) {
+               if (remaining <= sizeof(struct dm_target_spec)) {
                        param->flags |= DM_BUFFER_FULL_FLAG;
                        break;
                }

diff --git a/kernel/ioctl/dm-ioctl.h b/kernel/ioctl/dm-ioctl.h
index 3747637a5befb86c817e8ccbfd96830d99868358..3caa494537eeea005d0068ad61b703af25270dd4 100644 (file)
--- a/kernel/ioctl/dm-ioctl.h
+++ b/kernel/ioctl/dm-ioctl.h
@@ -221,8 +221,8 @@ enum {
 
 #define DM_VERSION_MAJOR       4
 #define DM_VERSION_MINOR       1
-#define DM_VERSION_PATCHLEVEL  0
-#define DM_VERSION_EXTRA       "-ioctl-cvs (2004-03-31)"
+#define DM_VERSION_PATCHLEVEL  1
+#define DM_VERSION_EXTRA       "-ioctl-cvs (2004-04-07)"
 
 /* Status bits */
 #define DM_READONLY_FLAG       (1 << 0) /* In/Out */

diff --git a/patches/common/linux-2.4.26-rc1-devmapper.patch b/patches/common/linux-2.4.26-rc1-devmapper.patch
index 5ce0ed09b54be422309e2f77cc7ab49f84d946ef..7df1dbad11b23fcb06b2a1531faece5e89f33904 100644 (file)
--- a/patches/common/linux-2.4.26-rc1-devmapper.patch
+++ b/patches/common/linux-2.4.26-rc1-devmapper.patch
@@ -2082,7 +2082,7 @@
 +              struct dm_target *ti = dm_table_get_target(table, i);
 +
 +              remaining = len - (outptr - outbuf);
-+              if (remaining < sizeof(struct dm_target_spec)) {
++              if (remaining <= sizeof(struct dm_target_spec)) {
 +                      param->flags |= DM_BUFFER_FULL_FLAG;
 +                      break;
 +              }
@@ -9400,8 +9400,8 @@
 +
 +#define DM_VERSION_MAJOR      4
 +#define DM_VERSION_MINOR      1
-+#define DM_VERSION_PATCHLEVEL 0
-+#define DM_VERSION_EXTRA      "-ioctl (2004-03-31)"
++#define DM_VERSION_PATCHLEVEL 1
++#define DM_VERSION_EXTRA      "-ioctl (2004-04-07)"
 +
 +/* Status bits */
 +#define DM_READONLY_FLAG      (1 << 0) /* In/Out */

diff --git a/patches/linux-2.4.26-rc1-devmapper-ioctl.patch b/patches/linux-2.4.26-rc1-devmapper-ioctl.patch
index 0e8f1c61632e7d1aa473c6abac43181fbedd97c5..19619c1d9e8a97afd5212f688658c0aff4700c29 100644 (file)
--- a/patches/linux-2.4.26-rc1-devmapper-ioctl.patch
+++ b/patches/linux-2.4.26-rc1-devmapper-ioctl.patch
@@ -2386,7 +2386,7 @@
 +              struct dm_target *ti = dm_table_get_target(table, i);
 +
 +              remaining = len - (outptr - outbuf);
-+              if (remaining < sizeof(struct dm_target_spec)) {
++              if (remaining <= sizeof(struct dm_target_spec)) {
 +                      param->flags |= DM_BUFFER_FULL_FLAG;
 +                      break;
 +              }
@@ -9755,8 +9755,8 @@
 +
 +#define DM_VERSION_MAJOR      4
 +#define DM_VERSION_MINOR      1
-+#define DM_VERSION_PATCHLEVEL 0
-+#define DM_VERSION_EXTRA      "-ioctl (2004-03-31)"
++#define DM_VERSION_PATCHLEVEL 1
++#define DM_VERSION_EXTRA      "-ioctl (2004-04-07)"
 +
 +/* Status bits */
 +#define DM_READONLY_FLAG      (1 << 0) /* In/Out */