[Qemu-devel] [PATCH] qemu-img: Fix content mismatch offset of image compare

[Qemu-devel] [PATCH] qemu-img: Fix content mismatch offset of image compare

[Fam Zheng]

We were lucky to pass qemu-iotests 048 (qemu-img compare case) but when
I tried to run with TEST_DIR=/tmp (tmpfs), it fails with a very weird
mismatch offset. This fixes the bug.

In the if branch, setting ret to 1 before using it makes dead code in
the next line: pnum is never added to mismatch offset even if ret was 0.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 qemu-img.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-img.c b/qemu-img.c
index bf3fb4f..2bab20d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1020,10 +1020,10 @@ static int img_compare(int argc, char **argv)
                 }
                 ret = compare_sectors(buf1, buf2, nb_sectors, &pnum);
                 if (ret || pnum != nb_sectors) {
-                    ret = 1;
                     qprintf(quiet, "Content mismatch at offset %" PRId64 "!\n",
                             sectors_to_bytes(
                                 ret ? sector_num : sector_num + pnum));
+                    ret = 1;
                     goto out;
                 }
             }
-- 
1.8.4.2

[Qemu-devel] [PATCH] qemu-img: re-assign ret after reporting original error

[Amos Kong]

Currently the output error is always:
  strerror(-4) -> Unknown error -4

This patch moves ret assignment after reporting original error.

Signed-off-by: Amos Kong <akong@redhat.com>
---
 qemu-img.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qemu-img.c b/qemu-img.c
index 926f0a0..1fd664f 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1045,9 +1045,9 @@ static int img_compare(int argc, char **argv)
             }
             if (ret) {
                 if (ret < 0) {
-                    ret = 4;
                     error_report("Error while reading offset %" PRId64 ": %s",
                                  sectors_to_bytes(sector_num), strerror(-ret));
+                    ret = 4;
                 }
                 goto out;
             }
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] qemu-img: Fix content mismatch offset of image compare

[Amos Kong]

On Wed, Nov 13, 2013 at 12:04:18PM +0800, Fam Zheng wrote:
> We were lucky to pass qemu-iotests 048 (qemu-img compare case) but when
> I tried to run with TEST_DIR=/tmp (tmpfs), it fails with a very weird
> mismatch offset. This fixes the bug.
> 
> In the if branch, setting ret to 1 before using it makes dead code in
> the next line: pnum is never added to mismatch offset even if ret was 0.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  qemu-img.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qemu-img.c b/qemu-img.c
> index bf3fb4f..2bab20d 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -1020,10 +1020,10 @@ static int img_compare(int argc, char **argv)
>                  }
>                  ret = compare_sectors(buf1, buf2, nb_sectors, &pnum);
>                  if (ret || pnum != nb_sectors) {
> -                    ret = 1;
>                      qprintf(quiet, "Content mismatch at offset %" PRId64 "!\n",
>                              sectors_to_bytes(
>                                  ret ? sector_num : sector_num + pnum));
> +                    ret = 1;

Looks good

>                      goto out;
>                  }
>              }
> -- 
> 1.8.4.2
> 

-- 
			Amos.

Re: [Qemu-devel] [PATCH] qemu-img: Fix content mismatch offset of image compare

[Miroslav Rezanina]

----- Original Message -----
> From: "Fam Zheng" <famz@redhat.com>
> To: qemu-devel@nongnu.org
> Cc: stefanha@redhat.com, kwolf@redhat.com, "Miroslav Rezanina" <mrezanin@redhat.com>
> Sent: Wednesday, November 13, 2013 5:04:18 AM
> Subject: [PATCH] qemu-img: Fix content mismatch offset of image compare
> 
> We were lucky to pass qemu-iotests 048 (qemu-img compare case) but when
> I tried to run with TEST_DIR=/tmp (tmpfs), it fails with a very weird
> mismatch offset. This fixes the bug.
> 
> In the if branch, setting ret to 1 before using it makes dead code in
> the next line: pnum is never added to mismatch offset even if ret was 0.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  qemu-img.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qemu-img.c b/qemu-img.c
> index bf3fb4f..2bab20d 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -1020,10 +1020,10 @@ static int img_compare(int argc, char **argv)
>                  }
>                  ret = compare_sectors(buf1, buf2, nb_sectors, &pnum);
>                  if (ret || pnum != nb_sectors) {
> -                    ret = 1;
>                      qprintf(quiet, "Content mismatch at offset %" PRId64
>                      "!\n",
>                              sectors_to_bytes(
>                                  ret ? sector_num : sector_num + pnum));
> +                    ret = 1;
>                      goto out;
>                  }
>              }
> --
> 1.8.4.2
> 
> 

Correct fix, setting variable to constant before test is definitely wrong.

Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com> 

-- 
Miroslav Rezanina
Software Engineer - Virtualization Team

Re: [Qemu-devel] [PATCH] qemu-img: re-assign ret after reporting original error

[Kevin Wolf]

Am 13.11.2013 um 06:24 hat Amos Kong geschrieben:
> Currently the output error is always:
>   strerror(-4) -> Unknown error -4
> 
> This patch moves ret assignment after reporting original error.
> 
> Signed-off-by: Amos Kong <akong@redhat.com>

Fam and Amos, can you consolidate the fixes in one patch, and update the
test case in the same patch as well?

Kevin