2022-04-25 12:47:22

by Dan Carpenter

Subject: [PATCH] dm integrity: fix error code in dm_integrity_ctr()

The "r" variable shadows an earlier "r" that has function scope. It
means that we accidentally return success instead of an error code.
Smatch has a warning for this:

drivers/md/dm-integrity.c:4503 dm_integrity_ctr()
warn: missing error code 'r'

Fixes: 7eada909bfd7 ("dm: add integrity target")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/md/dm-integrity.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 36ae30b73a6e..3d5a0ce123c9 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -4494,8 +4494,6 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)
}

if (should_write_sb) {
- int r;
-
init_journal(ic, 0, ic->journal_sections, 0);
r = dm_integrity_failed(ic);
if (unlikely(r)) {
--
2.35.1

2022-04-25 16:57:06

by Mikulas Patocka

Subject: Re: [PATCH] dm integrity: fix error code in dm_integrity_ctr()

Thanks for finding it.


On Mon, 25 Apr 2022, Dan Carpenter wrote:

> The "r" variable shadows an earlier "r" that has function scope. It
> means that we accidentally return success instead of an error code.
> Smatch has a warning for this:
>
> drivers/md/dm-integrity.c:4503 dm_integrity_ctr()
> warn: missing error code 'r'
>
> Fixes: 7eada909bfd7 ("dm: add integrity target")
> Signed-off-by: Dan Carpenter <[email protected]>

add:

Cc: [email protected]
Reviewed-by: Mikulas Patocka <[email protected]>

> ---
> drivers/md/dm-integrity.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
> index 36ae30b73a6e..3d5a0ce123c9 100644
> --- a/drivers/md/dm-integrity.c
> +++ b/drivers/md/dm-integrity.c
> @@ -4494,8 +4494,6 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)
> }
>
> if (should_write_sb) {
> - int r;
> -
> init_journal(ic, 0, ic->journal_sections, 0);
> r = dm_integrity_failed(ic);
> if (unlikely(r)) {
> --
> 2.35.1
>