* [PATCH 3.4,3.5 and earlier] dm: fix truncated status strings
@ 2013-12-06 19:31 Mikulas Patocka
2013-12-09 16:17 ` Luis Henriques
0 siblings, 1 reply; 3+ messages in thread
From: Mikulas Patocka @ 2013-12-06 19:31 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: stable, dm-devel
Hi
I noticed that the upstream commit
fd7c092e711ebab55b2688d3859d95dfd0301f73 wasn't added to 3.4 stable
kernel, so here I am resending it. It can also, with small changes, be
applied to 3.5, 3.2, 3.0 and other stable kernels.
Mikulas
Backport of upstream commit fd7c092e711ebab55b2688d3859d95dfd0301f73 for
kernel 3.4
dm: fix truncated status strings
Avoid returning a truncated table or status string instead of setting
the DM_BUFFER_FULL_FLAG when the last target of a table fills the
buffer.
When processing a table or status request, the function retrieve_status
calls ti->type->status. If ti->type->status returns non-zero,
retrieve_status assumes that the buffer overflowed and sets
DM_BUFFER_FULL_FLAG.
However, targets don't return non-zero values from their status method
on overflow. Most targets returns always zero.
If a buffer overflow happens in a target that is not the last in the
table, it gets noticed during the next iteration of the loop in
retrieve_status; but if a buffer overflow happens in the last target, it
goes unnoticed and erroneously truncated data is returned.
In the current code, the targets behave in the following way:
* dm-crypt returns -ENOMEM if there is not enough space to store the
key, but it returns 0 on all other overflows.
* dm-thin returns errors from the status method if a disk error happened.
This is incorrect because retrieve_status doesn't check the error
code, it assumes that all non-zero values mean buffer overflow.
* all the other targets always return 0.
This patch changes the ti->type->status function to return void (because
most targets don't use the return code). Overflow is detected in
retrieve_status: if the status method fills up the remaining space
completely, it is assumed that buffer overflow happened.
Cc: stable@vger.kernel.org
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
---
drivers/md/dm-crypt.c | 37 ++++----------------
drivers/md/dm-delay.c | 6 +--
drivers/md/dm-flakey.c | 5 +-
drivers/md/dm-ioctl.c | 18 ++++++---
drivers/md/dm-linear.c | 5 +-
drivers/md/dm-mpath.c | 6 +--
drivers/md/dm-raid.c | 6 +--
drivers/md/dm-raid1.c | 6 +--
drivers/md/dm-snap.c | 12 ++----
drivers/md/dm-stripe.c | 5 +-
drivers/md/dm-thin.c | 76 +++++++++++++++++++++++++-----------------
drivers/md/dm-verity.c | 6 +--
include/linux/device-mapper.h | 4 +-
13 files changed, 88 insertions(+), 104 deletions(-)
Index: linux-3.4.71/drivers/md/dm-crypt.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-crypt.c 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-crypt.c 2013-11-30 00:29:04.000000000 +0100
@@ -1262,20 +1262,6 @@ static int crypt_decode_key(u8 *key, cha
return 0;
}
-/*
- * Encode key into its hex representation
- */
-static void crypt_encode_key(char *hex, u8 *key, unsigned int size)
-{
- unsigned int i;
-
- for (i = 0; i < size; i++) {
- sprintf(hex, "%02x", *key);
- hex += 2;
- key++;
- }
-}
-
static void crypt_free_tfms(struct crypt_config *cc, int cpu)
{
struct crypt_cpu *cpu_cc = per_cpu_ptr(cc->cpu, cpu);
@@ -1741,11 +1727,11 @@ static int crypt_map(struct dm_target *t
return DM_MAPIO_SUBMITTED;
}
-static int crypt_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned int maxlen)
+static void crypt_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned int maxlen)
{
struct crypt_config *cc = ti->private;
- unsigned int sz = 0;
+ unsigned i, sz = 0;
switch (type) {
case STATUSTYPE_INFO:
@@ -1755,17 +1741,11 @@ static int crypt_status(struct dm_target
case STATUSTYPE_TABLE:
DMEMIT("%s ", cc->cipher_string);
- if (cc->key_size > 0) {
- if ((maxlen - sz) < ((cc->key_size << 1) + 1))
- return -ENOMEM;
-
- crypt_encode_key(result + sz, cc->key, cc->key_size);
- sz += cc->key_size << 1;
- } else {
- if (sz >= maxlen)
- return -ENOMEM;
- result[sz++] = '-';
- }
+ if (cc->key_size > 0)
+ for (i = 0; i < cc->key_size; i++)
+ DMEMIT("%02x", cc->key[i]);
+ else
+ DMEMIT("-");
DMEMIT(" %llu %s %llu", (unsigned long long)cc->iv_offset,
cc->dev->name, (unsigned long long)cc->start);
@@ -1775,7 +1755,6 @@ static int crypt_status(struct dm_target
break;
}
- return 0;
}
static void crypt_postsuspend(struct dm_target *ti)
Index: linux-3.4.71/drivers/md/dm-delay.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-delay.c 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-delay.c 2013-11-30 00:31:12.000000000 +0100
@@ -294,8 +294,8 @@ static int delay_map(struct dm_target *t
return delay_bio(dc, dc->read_delay, bio);
}
-static int delay_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned maxlen)
+static void delay_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned maxlen)
{
struct delay_c *dc = ti->private;
int sz = 0;
@@ -315,8 +315,6 @@ static int delay_status(struct dm_target
dc->write_delay);
break;
}
-
- return 0;
}
static int delay_iterate_devices(struct dm_target *ti,
Index: linux-3.4.71/drivers/md/dm-flakey.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-flakey.c 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-flakey.c 2013-11-30 00:29:33.000000000 +0100
@@ -332,8 +332,8 @@ static int flakey_end_io(struct dm_targe
return error;
}
-static int flakey_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned int maxlen)
+static void flakey_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned int maxlen)
{
unsigned sz = 0;
struct flakey_c *fc = ti->private;
@@ -363,7 +363,6 @@ static int flakey_status(struct dm_targe
break;
}
- return 0;
}
static int flakey_ioctl(struct dm_target *ti, unsigned int cmd, unsigned long arg)
Index: linux-3.4.71/drivers/md/dm-ioctl.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-ioctl.c 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-ioctl.c 2013-11-30 01:03:33.000000000 +0100
@@ -1066,6 +1066,7 @@ static void retrieve_status(struct dm_ta
num_targets = dm_table_get_num_targets(table);
for (i = 0; i < num_targets; i++) {
struct dm_target *ti = dm_table_get_target(table, i);
+ size_t l;
remaining = len - (outptr - outbuf);
if (remaining <= sizeof(struct dm_target_spec)) {
@@ -1089,15 +1090,18 @@ static void retrieve_status(struct dm_ta
}
/* Get the status/table string from the target driver */
- if (ti->type->status) {
- if (ti->type->status(ti, type, outptr, remaining)) {
- param->flags |= DM_BUFFER_FULL_FLAG;
- break;
- }
- } else
+ if (ti->type->status)
+ ti->type->status(ti, type, outptr, remaining);
+ else
outptr[0] = '\0';
- outptr += strlen(outptr) + 1;
+ l = strlen(outptr) + 1;
+ if (l == remaining) {
+ param->flags |= DM_BUFFER_FULL_FLAG;
+ break;
+ }
+
+ outptr += l;
used = param->data_start + (outptr - outbuf);
outptr = align_ptr(outptr);
Index: linux-3.4.71/drivers/md/dm-linear.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-linear.c 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-linear.c 2013-11-30 00:31:44.000000000 +0100
@@ -95,8 +95,8 @@ static int linear_map(struct dm_target *
return DM_MAPIO_REMAPPED;
}
-static int linear_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned int maxlen)
+static void linear_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned int maxlen)
{
struct linear_c *lc = (struct linear_c *) ti->private;
@@ -110,7 +110,6 @@ static int linear_status(struct dm_targe
(unsigned long long)lc->start);
break;
}
- return 0;
}
static int linear_ioctl(struct dm_target *ti, unsigned int cmd,
Index: linux-3.4.71/drivers/md/dm-mpath.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-mpath.c 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-mpath.c 2013-11-30 00:29:53.000000000 +0100
@@ -1343,8 +1343,8 @@ static void multipath_resume(struct dm_t
* [priority selector-name num_ps_args [ps_args]*
* num_paths num_selector_args [path_dev [selector_args]* ]+ ]+
*/
-static int multipath_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned int maxlen)
+static void multipath_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned int maxlen)
{
int sz = 0;
unsigned long flags;
@@ -1447,8 +1447,6 @@ static int multipath_status(struct dm_ta
}
spin_unlock_irqrestore(&m->lock, flags);
-
- return 0;
}
static int multipath_message(struct dm_target *ti, unsigned argc, char **argv)
Index: linux-3.4.71/drivers/md/dm-raid.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-raid.c 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-raid.c 2013-11-30 00:30:18.000000000 +0100
@@ -1067,8 +1067,8 @@ static int raid_map(struct dm_target *ti
return DM_MAPIO_SUBMITTED;
}
-static int raid_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned maxlen)
+static void raid_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned maxlen)
{
struct raid_set *rs = ti->private;
unsigned raid_param_cnt = 1; /* at least 1 for chunksize */
@@ -1203,8 +1203,6 @@ static int raid_status(struct dm_target
DMEMIT(" -");
}
}
-
- return 0;
}
static int raid_iterate_devices(struct dm_target *ti, iterate_devices_callout_fn fn, void *data)
Index: linux-3.4.71/drivers/md/dm-raid1.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-raid1.c 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-raid1.c 2013-11-30 00:32:03.000000000 +0100
@@ -1362,8 +1362,8 @@ static char device_status_char(struct mi
}
-static int mirror_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned int maxlen)
+static void mirror_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned int maxlen)
{
unsigned int m, sz = 0;
struct mirror_set *ms = (struct mirror_set *) ti->private;
@@ -1398,8 +1398,6 @@ static int mirror_status(struct dm_targe
if (ms->features & DM_RAID1_HANDLE_ERRORS)
DMEMIT(" 1 handle_errors");
}
-
- return 0;
}
static int mirror_iterate_devices(struct dm_target *ti,
Index: linux-3.4.71/drivers/md/dm-snap.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-snap.c 2013-10-11 14:48:06.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-snap.c 2013-11-30 00:30:50.000000000 +0100
@@ -1845,8 +1845,8 @@ static void snapshot_merge_resume(struct
start_merge(s);
}
-static int snapshot_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned int maxlen)
+static void snapshot_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned int maxlen)
{
unsigned sz = 0;
struct dm_snapshot *snap = ti->private;
@@ -1892,8 +1892,6 @@ static int snapshot_status(struct dm_tar
maxlen - sz);
break;
}
-
- return 0;
}
static int snapshot_iterate_devices(struct dm_target *ti,
@@ -2148,8 +2146,8 @@ static void origin_resume(struct dm_targ
ti->split_io = get_origin_minimum_chunksize(dev->bdev);
}
-static int origin_status(struct dm_target *ti, status_type_t type, char *result,
- unsigned int maxlen)
+static void origin_status(struct dm_target *ti, status_type_t type, char *result,
+ unsigned int maxlen)
{
struct dm_dev *dev = ti->private;
@@ -2162,8 +2160,6 @@ static int origin_status(struct dm_targe
snprintf(result, maxlen, "%s", dev->name);
break;
}
-
- return 0;
}
static int origin_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
Index: linux-3.4.71/drivers/md/dm-stripe.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-stripe.c 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-stripe.c 2013-11-30 00:32:36.000000000 +0100
@@ -302,8 +302,8 @@ static int stripe_map(struct dm_target *
*
*/
-static int stripe_status(struct dm_target *ti,
- status_type_t type, char *result, unsigned int maxlen)
+static void stripe_status(struct dm_target *ti,
+ status_type_t type, char *result, unsigned int maxlen)
{
struct stripe_c *sc = (struct stripe_c *) ti->private;
char buffer[sc->stripes + 1];
@@ -330,7 +330,6 @@ static int stripe_status(struct dm_targe
(unsigned long long)sc->stripe[i].physical_start);
break;
}
- return 0;
}
static int stripe_end_io(struct dm_target *ti, struct bio *bio,
Index: linux-3.4.71/drivers/md/dm-thin.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-thin.c 2013-05-20 17:55:14.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-thin.c 2013-11-30 01:01:51.000000000 +0100
@@ -2325,8 +2325,8 @@ static int pool_message(struct dm_target
* <transaction id> <used metadata sectors>/<total metadata sectors>
* <used data sectors>/<total data sectors> <held metadata root>
*/
-static int pool_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned maxlen)
+static void pool_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned maxlen)
{
int r, count;
unsigned sz = 0;
@@ -2343,32 +2343,41 @@ static int pool_status(struct dm_target
switch (type) {
case STATUSTYPE_INFO:
- r = dm_pool_get_metadata_transaction_id(pool->pmd,
- &transaction_id);
- if (r)
- return r;
-
- r = dm_pool_get_free_metadata_block_count(pool->pmd,
- &nr_free_blocks_metadata);
- if (r)
- return r;
+ r = dm_pool_get_metadata_transaction_id(pool->pmd, &transaction_id);
+ if (r) {
+ DMERR("dm_pool_get_metadata_transaction_id returned %d", r);
+ goto err;
+ }
+
+ r = dm_pool_get_free_metadata_block_count(pool->pmd, &nr_free_blocks_metadata);
+ if (r) {
+ DMERR("dm_pool_get_free_metadata_block_count returned %d", r);
+ goto err;
+ }
r = dm_pool_get_metadata_dev_size(pool->pmd, &nr_blocks_metadata);
- if (r)
- return r;
+ if (r) {
+ DMERR("dm_pool_get_metadata_dev_size returned %d", r);
+ goto err;
+ }
- r = dm_pool_get_free_block_count(pool->pmd,
- &nr_free_blocks_data);
- if (r)
- return r;
+ r = dm_pool_get_free_block_count(pool->pmd, &nr_free_blocks_data);
+ if (r) {
+ DMERR("dm_pool_get_free_block_count returned %d", r);
+ goto err;
+ }
r = dm_pool_get_data_dev_size(pool->pmd, &nr_blocks_data);
- if (r)
- return r;
+ if (r) {
+ DMERR("dm_pool_get_data_dev_size returned %d", r);
+ goto err;
+ }
r = dm_pool_get_held_metadata_root(pool->pmd, &held_root);
- if (r)
- return r;
+ if (r) {
+ DMERR("dm_pool_get_metadata_snap returned %d", r);
+ goto err;
+ }
DMEMIT("%llu %llu/%llu %llu/%llu ",
(unsigned long long)transaction_id,
@@ -2406,8 +2415,10 @@ static int pool_status(struct dm_target
break;
}
+ return;
- return 0;
+err:
+ DMEMIT("Error");
}
static int pool_iterate_devices(struct dm_target *ti,
@@ -2659,8 +2670,8 @@ static void thin_postsuspend(struct dm_t
/*
* <nr mapped sectors> <highest mapped sector>
*/
-static int thin_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned maxlen)
+static void thin_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned maxlen)
{
int r;
ssize_t sz = 0;
@@ -2674,12 +2685,16 @@ static int thin_status(struct dm_target
switch (type) {
case STATUSTYPE_INFO:
r = dm_thin_get_mapped_count(tc->td, &mapped);
- if (r)
- return r;
+ if (r) {
+ DMERR("dm_thin_get_mapped_count returned %d", r);
+ goto err;
+ }
r = dm_thin_get_highest_mapped_block(tc->td, &highest);
- if (r < 0)
- return r;
+ if (r < 0) {
+ DMERR("dm_thin_get_highest_mapped_block returned %d", r);
+ goto err;
+ }
DMEMIT("%llu ", mapped * tc->pool->sectors_per_block);
if (r)
@@ -2699,7 +2714,10 @@ static int thin_status(struct dm_target
}
}
- return 0;
+ return;
+
+err:
+ DMEMIT("Error");
}
static int thin_iterate_devices(struct dm_target *ti,
Index: linux-3.4.71/drivers/md/dm-verity.c
===================================================================
--- linux-3.4.71.orig/drivers/md/dm-verity.c 2013-09-21 17:40:30.000000000 +0200
+++ linux-3.4.71/drivers/md/dm-verity.c 2013-11-30 00:26:58.000000000 +0100
@@ -514,8 +514,8 @@ static int verity_map(struct dm_target *
/*
* Status: V (valid) or C (corruption found)
*/
-static int verity_status(struct dm_target *ti, status_type_t type,
- char *result, unsigned maxlen)
+static void verity_status(struct dm_target *ti, status_type_t type,
+ char *result, unsigned maxlen)
{
struct dm_verity *v = ti->private;
unsigned sz = 0;
@@ -546,8 +546,6 @@ static int verity_status(struct dm_targe
DMEMIT("%02x", v->salt[x]);
break;
}
-
- return 0;
}
static int verity_ioctl(struct dm_target *ti, unsigned cmd,
Index: linux-3.4.71/include/linux/device-mapper.h
===================================================================
--- linux-3.4.71.orig/include/linux/device-mapper.h 2013-04-26 06:20:25.000000000 +0200
+++ linux-3.4.71/include/linux/device-mapper.h 2013-11-30 00:27:24.000000000 +0100
@@ -72,8 +72,8 @@ typedef void (*dm_postsuspend_fn) (struc
typedef int (*dm_preresume_fn) (struct dm_target *ti);
typedef void (*dm_resume_fn) (struct dm_target *ti);
-typedef int (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
- char *result, unsigned int maxlen);
+typedef void (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
+ char *result, unsigned int maxlen);
typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 3.4,3.5 and earlier] dm: fix truncated status strings
2013-12-06 19:31 [PATCH 3.4,3.5 and earlier] dm: fix truncated status strings Mikulas Patocka
@ 2013-12-09 16:17 ` Luis Henriques
2013-12-09 17:11 ` Luis Henriques
0 siblings, 1 reply; 3+ messages in thread
From: Luis Henriques @ 2013-12-09 16:17 UTC (permalink / raw)
To: Mikulas Patocka; +Cc: Greg Kroah-Hartman, stable, dm-devel
On Fri, Dec 06, 2013 at 02:31:03PM -0500, Mikulas Patocka wrote:
> Hi
>
> I noticed that the upstream commit
> fd7c092e711ebab55b2688d3859d95dfd0301f73 wasn't added to 3.4 stable
> kernel, so here I am resending it. It can also, with small changes, be
> applied to 3.5, 3.2, 3.0 and other stable kernels.
>
> Mikulas
>
Thank you Mikulas, I was going to queue this backport to the 3.5
kernel when I noticed something that seems to be wrong:
[ ... ]
> static int stripe_end_io(struct dm_target *ti, struct bio *bio,
> Index: linux-3.4.71/drivers/md/dm-thin.c
> ===================================================================
> --- linux-3.4.71.orig/drivers/md/dm-thin.c 2013-05-20 17:55:14.000000000 +0200
> +++ linux-3.4.71/drivers/md/dm-thin.c 2013-11-30 01:01:51.000000000 +0100
> @@ -2325,8 +2325,8 @@ static int pool_message(struct dm_target
> * <transaction id> <used metadata sectors>/<total metadata sectors>
> * <used data sectors>/<total data sectors> <held metadata root>
> */
> -static int pool_status(struct dm_target *ti, status_type_t type,
> - char *result, unsigned maxlen)
> +static void pool_status(struct dm_target *ti, status_type_t type,
> + char *result, unsigned maxlen)
> {
> int r, count;
> unsigned sz = 0;
> @@ -2343,32 +2343,41 @@ static int pool_status(struct dm_target
>
> switch (type) {
> case STATUSTYPE_INFO:
> - r = dm_pool_get_metadata_transaction_id(pool->pmd,
> - &transaction_id);
> - if (r)
> - return r;
> -
> - r = dm_pool_get_free_metadata_block_count(pool->pmd,
> - &nr_free_blocks_metadata);
> - if (r)
> - return r;
> + r = dm_pool_get_metadata_transaction_id(pool->pmd, &transaction_id);
> + if (r) {
> + DMERR("dm_pool_get_metadata_transaction_id returned %d", r);
> + goto err;
> + }
> +
> + r = dm_pool_get_free_metadata_block_count(pool->pmd, &nr_free_blocks_metadata);
> + if (r) {
> + DMERR("dm_pool_get_free_metadata_block_count returned %d", r);
> + goto err;
> + }
>
> r = dm_pool_get_metadata_dev_size(pool->pmd, &nr_blocks_metadata);
> - if (r)
> - return r;
> + if (r) {
> + DMERR("dm_pool_get_metadata_dev_size returned %d", r);
> + goto err;
> + }
>
> - r = dm_pool_get_free_block_count(pool->pmd,
> - &nr_free_blocks_data);
> - if (r)
> - return r;
> + r = dm_pool_get_free_block_count(pool->pmd, &nr_free_blocks_data);
> + if (r) {
> + DMERR("dm_pool_get_free_block_count returned %d", r);
> + goto err;
> + }
>
> r = dm_pool_get_data_dev_size(pool->pmd, &nr_blocks_data);
> - if (r)
> - return r;
> + if (r) {
> + DMERR("dm_pool_get_data_dev_size returned %d", r);
> + goto err;
> + }
>
> r = dm_pool_get_held_metadata_root(pool->pmd, &held_root);
Looking at the original commit, the above line seems to be wrong.
Shouldn't it be:
r = dm_pool_get_metadata_snap(pool->pmd, &held_root);
Cheers,
--
Luis
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 3.4,3.5 and earlier] dm: fix truncated status strings
2013-12-09 16:17 ` Luis Henriques
@ 2013-12-09 17:11 ` Luis Henriques
0 siblings, 0 replies; 3+ messages in thread
From: Luis Henriques @ 2013-12-09 17:11 UTC (permalink / raw)
To: Mikulas Patocka; +Cc: Greg Kroah-Hartman, stable, dm-devel
On Mon, Dec 09, 2013 at 04:17:01PM +0000, Luis Henriques wrote:
> On Fri, Dec 06, 2013 at 02:31:03PM -0500, Mikulas Patocka wrote:
> > Hi
> >
> > I noticed that the upstream commit
> > fd7c092e711ebab55b2688d3859d95dfd0301f73 wasn't added to 3.4 stable
> > kernel, so here I am resending it. It can also, with small changes, be
> > applied to 3.5, 3.2, 3.0 and other stable kernels.
> >
> > Mikulas
> >
>
> Thank you Mikulas, I was going to queue this backport to the 3.5
> kernel when I noticed something that seems to be wrong:
Bah, please ignore me. I was reviewing this patch against the 3.5
kernel, which definitely requires a slightly different backport (as
you suggested).
Cheers,
--
Luis
>
> [ ... ]
>
> > static int stripe_end_io(struct dm_target *ti, struct bio *bio,
> > Index: linux-3.4.71/drivers/md/dm-thin.c
> > ===================================================================
> > --- linux-3.4.71.orig/drivers/md/dm-thin.c 2013-05-20 17:55:14.000000000 +0200
> > +++ linux-3.4.71/drivers/md/dm-thin.c 2013-11-30 01:01:51.000000000 +0100
> > @@ -2325,8 +2325,8 @@ static int pool_message(struct dm_target
> > * <transaction id> <used metadata sectors>/<total metadata sectors>
> > * <used data sectors>/<total data sectors> <held metadata root>
> > */
> > -static int pool_status(struct dm_target *ti, status_type_t type,
> > - char *result, unsigned maxlen)
> > +static void pool_status(struct dm_target *ti, status_type_t type,
> > + char *result, unsigned maxlen)
> > {
> > int r, count;
> > unsigned sz = 0;
> > @@ -2343,32 +2343,41 @@ static int pool_status(struct dm_target
> >
> > switch (type) {
> > case STATUSTYPE_INFO:
> > - r = dm_pool_get_metadata_transaction_id(pool->pmd,
> > - &transaction_id);
> > - if (r)
> > - return r;
> > -
> > - r = dm_pool_get_free_metadata_block_count(pool->pmd,
> > - &nr_free_blocks_metadata);
> > - if (r)
> > - return r;
> > + r = dm_pool_get_metadata_transaction_id(pool->pmd, &transaction_id);
> > + if (r) {
> > + DMERR("dm_pool_get_metadata_transaction_id returned %d", r);
> > + goto err;
> > + }
> > +
> > + r = dm_pool_get_free_metadata_block_count(pool->pmd, &nr_free_blocks_metadata);
> > + if (r) {
> > + DMERR("dm_pool_get_free_metadata_block_count returned %d", r);
> > + goto err;
> > + }
> >
> > r = dm_pool_get_metadata_dev_size(pool->pmd, &nr_blocks_metadata);
> > - if (r)
> > - return r;
> > + if (r) {
> > + DMERR("dm_pool_get_metadata_dev_size returned %d", r);
> > + goto err;
> > + }
> >
> > - r = dm_pool_get_free_block_count(pool->pmd,
> > - &nr_free_blocks_data);
> > - if (r)
> > - return r;
> > + r = dm_pool_get_free_block_count(pool->pmd, &nr_free_blocks_data);
> > + if (r) {
> > + DMERR("dm_pool_get_free_block_count returned %d", r);
> > + goto err;
> > + }
> >
> > r = dm_pool_get_data_dev_size(pool->pmd, &nr_blocks_data);
> > - if (r)
> > - return r;
> > + if (r) {
> > + DMERR("dm_pool_get_data_dev_size returned %d", r);
> > + goto err;
> > + }
> >
> > r = dm_pool_get_held_metadata_root(pool->pmd, &held_root);
>
> Looking at the original commit, the above line seems to be wrong.
> Shouldn't it be:
>
> r = dm_pool_get_metadata_snap(pool->pmd, &held_root);
>
> Cheers,
> --
> Luis
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-09 17:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-06 19:31 [PATCH 3.4,3.5 and earlier] dm: fix truncated status strings Mikulas Patocka
2013-12-09 16:17 ` Luis Henriques
2013-12-09 17:11 ` Luis Henriques
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.